Added in function definitions