Adding polling (mega-hack).