Tweaks due to Paul