change: improvement of the generation code.