rearrangement of templates #2