New stuff for [I and ]I.