add since for polling, rename some vars