Working on more responsiveness