Updated variables and template