Add auto rotation functionality - beta