Add improved responsiveness