Added in a number of things