Added some more responsiveness.