Added ICIC and fixed some bugs