Updating to latest Shock code.