live polling logic fixed