updated data parsing