updated to match new varnames