some more tweaking