Update to Input Handling