tweaks from Nicci Brown