added other changes that have been made to the upgrade version