Gear selection issues

Reformed :mrgreen: