Changed the way poll_count is handled