Added in initialization and some helper functions