Auto controls

Merging auto controls