New data format now working.