polling improvements