Updated to most recent Shock code.
merge