Rearranging templates to try even more...