add more responsiveness