Updated to latest Shock code.