Adding changes after CR