MOPS refactored