Updated manual mode