Reorganizing updateOriginalInput calls as discussed in #250