Continue to wrestle with factories