Added missed code from merge