more changes into i2ctools version