Updated factory.