Added a bunch more info