final tweaks per Haibo email at 5:51