Added manual override possibility