Changed to using Input::has in lots of if statements