more tweaking...