tweaks from Margaret