still more tweaking