WIP: use new data format
migrate to the new data format