+ Added some responsiveness