Added some stuff
Merged