Responsiveness improvements. For #11