Added manual mode