More work on the upgrade mechanism