Added some cool stuff