more upgrade improvements