Responsiveness improvements, #5