Added manual control in the app