Refactored MS