Swap refactor with Anthony