refactor, customise poll response
Merge commit 'd3a9051'