Added a number of different things