improvements for the polling flow