bit more tweaking