Added a little more responsiveness