Tweaks requested by Paul