Improved the responsiveness