Added stuff
Merging