Markup below was changed, but these still have the old variable names.