1. Added more responsiveness