slightly reorged templats