Added more responsiveness