2nd attempt at a caps swap