i2 with Jeff's edits