Added in features that were missed with last commit