dmoa rearrangement for readability