Improve responsiveness