Improve responsivness