new generator basically complete