Added some new stuff
Tried with things a little bit