additional tweaks from work