Updated to use new Gear class