tweaks accumulated through mock 2