modifying to cope with new JSON
merge