Added some of the good stuff