still more tweaking of 2005