more tweaks to that 2