upgrade and more persistence