added more responsiveness