fixed poller - took changes from angular branch experiment