removed engine factory, part 2