Added responsiveness