Tweaks to pingpong