more tweaking :(