and more tweaking