Updated how polling works