updated so works with latest data