Final change for templates