Responsiveness improvements