Added the stuff I did individually to Chris/