updated for responsiveness