wip
improvment of v2 generator
build