move some factory traits around