Added some new stuff
Fixed a merge issue