Add auto mode that works