Improve for responsiveness