more work on the data storage