Improved embedded polling