Revise to match new data formatting/naming