more changes for the upgrade
last change, possibly