WIP: simpler verify data