[IM] Changes after review