Added some nice things