added a whole host of things