GearSwap - midaction refactoring