updated data parser to do stuff right