with Victor's fixes for new format raw data