Further updates to responsiveness