More upgrade work