Merge Changes

Merging my updates in.