ordering and template changes