updated code to handle latest data dumps