first changes to template