Added some stuff
Merged conflict