Added in some other's stuff