Refactoring Multiplus...