Issue #673 Risk incorporated in evaluation