Now not restarting on orientation changes