Added some responsiveness