Removed polling for the moment