Added gears and some updates