OhShi and GearSwap updates