adjust to new data format