Added in some new stuff