MB-135 #normalized and refactored