Modify the factory
Modify the factory