Updated for C3 and I2