Pre ICL changes