Improve responsivity