Removed Un-need functions and changed gear assignment