Input Helper changes

Modified the rest of the files affected