Incorporate new factory, more let statements