refactored MSwork