new cut at gen level, bug fix,