changed checks for i4 and i2/i1