improvements for responsiveness