New ordering, replaced some templates