[IC} Many Updates and changes