changes to data parsing