Updates to improve responsiveness