Integrated back into edit.mc