Added some centralised input control