merging stuff
Merged some stuff