Kit swapping