Added auto rotation