refactoring wd->rola, keepExecutionUnit, refs #4