More factory changes