The Gun Swap - Solved?