Added some new cool stuff