Fixed data storage
merge conflicts