updated to match new json schema