more responsiveness ...
wip