Moving Persona entirely into the factory.