Manual mode added