revaming parsing of json