... and yet more tweaking