Added Input Handling