refactored cabinet