add some comments and make sure upgrade is working as expected