Adding template changes to this commit