updated variable names and html