updates from last IC commit