GearSwap - Two more adjustments-_-