Added lots of good stuff