Changes in Template