Added a lot of responsiveness