+ some more tweaking