7 Commits (fix_editOrder)