Simplify assumption A generation a bit