Improved responsiveness a bit