added manual override