Update with changes after CR