Added in some helper functions