Even more factory changes