Revert "Changed arrangement of input functions"

This reverts commit 71e41c54834eec3408718a08a59a2c8229f10fc8.
Revert "Revert "Changed arrangement of input functions""

This reverts commit f3b2b5f9ac2a82e1857536f6c8bbb2e5c5d8b45c.