Still more tweaking