Added in some extra stuff