Additional tweaks requested by Mark