WIP: use new data format