Merge AtoiDef to I, add comments