added parsing of the json