Support for upgrades and CAPRICE!!