Change over more templates