Updating to most recent Shock code.
Merge