more prelim upgrade work