Redo my changes removed in merge