moving more stuff over to the upgrade