added some data stuff
Merging conflicts