Tweaks to Polling