Added manual option