Merge with Greg
Finished merge with Greg