conn: rework the polling