Revamped to the recent edition of the 'pollers' glib branch