slowly introducing the new architecture