yet more tweaking