Poll code rework with Jens