Update to Improve responsivenesss