Changes to make easier to tweak inputs