Changed to factory instead