tweaks suggested by Rob!