Mas refactoring 3