Updated for I2C