adding Input Functionality
fixing merge conflicts
fixing merge