Added manual control option