tweaks from feedback from Donald