Improve responsiveness!
Fixed merge conflict