working on data storage and more datasets