some reordering of content in generator