redo things that got removed in merge