Added some more responsiveness