New format

Ready for merge using new data format