Updated for cartridge 2.0