Refactored computing merged