Added Polling. And a few other changed.