completed template changes