Now correctly parsing data