Changes in template