updated to nicola's json