Added manual override