more tweaks again