refactor for morc