Added some nice stuff