Major changes for upgrade presentation