- Added solutions by Arne Sommer.

18 files changed, 1329 insertions, 1083 deletions

diff --git a/challenge-055/arne-sommer/blog.txt b/challenge-055/arne-sommer/blog.txt
new file mode 100644
index 0000000000..3004e40ccc
--- /dev/null
+++ b/challenge-055/arne-sommer/blog.txt
@@ -0,0 +1 @@
+https://raku-musings.com/flip-wave.html
diff --git a/challenge-055/arne-sommer/raku/ch-1.p6 b/challenge-055/arne-sommer/raku/ch-1.p6
new file mode 100755
index 0000000000..8a37bee01e
--- /dev/null
+++ b/challenge-055/arne-sommer/raku/ch-1.p6
@@ -0,0 +1,45 @@
+#! /usr/bin/env raku
+
+# subset Binary of Int where * ~~ /^<[01]>*$/;
+subset Binary where * ~~ /^<[01]>*$/;
+
+unit sub MAIN (Binary $binary, :$verbose);
+
+my $size = $binary.chars;
+my %result;
+
+say ": Binary number $binary with length $size" if $verbose;
+
+for ^$size -> $l
+{
+  for $l .. $size-1 -> $r
+  {
+    my $new   = flip-binary($binary, $l, $r);
+    my $count = count-ones($new);
+
+    %result{$count}.push("L=$l, R=$r -> $new");
+    say ": $binary + L:$l R:$r -> $new C:$count" if $verbose;
+  }
+}
+
+say ": Hash: { %result.raku }" if $verbose;
+
+my $answer = %result.keys.max;
+
+say "The highest number of ones: $answer";
+
+.say for @(%result{$answer});
+
+sub flip-binary (Binary $number is copy, $l, $r)
+{
+  for $l .. $r -> $index
+  {
+    $number.substr-rw($index,1) = $number.substr($index,1) eq "1" ?? "0"!! "1";
+  }
+  return $number;
+}
+
+sub count-ones (Binary $number)
+{
+  return $number.comb.grep( * == "1" ).elems;
+}
\ No newline at end of file
diff --git a/challenge-055/arne-sommer/raku/ch-2.p6 b/challenge-055/arne-sommer/raku/ch-2.p6
new file mode 100755
index 0000000000..03576538cc
--- /dev/null
+++ b/challenge-055/arne-sommer/raku/ch-2.p6
@@ -0,0 +1,32 @@
+#! /usr/bin/env raku
+
+unit sub MAIN (*@integers where all(@integers) ~~ Int, :$verbose);
+
+for @integers.permutations.unique(:with(&[eqv])) -> @list
+{
+  say ": Checking @list[]" if $verbose;
+
+  say @list if is-wave(@list);
+}
+
+sub is-wave(@list)
+{
+  my $current = @list[0];
+  my $greater = False;
+  
+  for @list[1 .. *] -> $next
+  {
+    if $greater
+    {
+      ($current = $next; return False) if $next < $current;
+    }
+    else
+    {
+      ($current = $next; return False) if $next > $current;
+    }
+    
+    $current = $next;
+    $greater = ! $greater;
+  }
+  return True;
+}
diff --git a/challenge-055/arne-sommer/raku/flip-binary b/challenge-055/arne-sommer/raku/flip-binary
new file mode 100755
index 0000000000..8a37bee01e
--- /dev/null
+++ b/challenge-055/arne-sommer/raku/flip-binary
@@ -0,0 +1,45 @@
+#! /usr/bin/env raku
+
+# subset Binary of Int where * ~~ /^<[01]>*$/;
+subset Binary where * ~~ /^<[01]>*$/;
+
+unit sub MAIN (Binary $binary, :$verbose);
+
+my $size = $binary.chars;
+my %result;
+
+say ": Binary number $binary with length $size" if $verbose;
+
+for ^$size -> $l
+{
+  for $l .. $size-1 -> $r
+  {
+    my $new   = flip-binary($binary, $l, $r);
+    my $count = count-ones($new);
+
+    %result{$count}.push("L=$l, R=$r -> $new");
+    say ": $binary + L:$l R:$r -> $new C:$count" if $verbose;
+  }
+}
+
+say ": Hash: { %result.raku }" if $verbose;
+
+my $answer = %result.keys.max;
+
+say "The highest number of ones: $answer";
+
+.say for @(%result{$answer});
+
+sub flip-binary (Binary $number is copy, $l, $r)
+{
+  for $l .. $r -> $index
+  {
+    $number.substr-rw($index,1) = $number.substr($index,1) eq "1" ?? "0"!! "1";
+  }
+  return $number;
+}
+
+sub count-ones (Binary $number)
+{
+  return $number.comb.grep( * == "1" ).elems;
+}
\ No newline at end of file
diff --git a/challenge-055/arne-sommer/raku/wave-array b/challenge-055/arne-sommer/raku/wave-array
new file mode 100755
index 0000000000..03576538cc
--- /dev/null
+++ b/challenge-055/arne-sommer/raku/wave-array
@@ -0,0 +1,32 @@
+#! /usr/bin/env raku
+
+unit sub MAIN (*@integers where all(@integers) ~~ Int, :$verbose);
+
+for @integers.permutations.unique(:with(&[eqv])) -> @list
+{
+  say ": Checking @list[]" if $verbose;
+
+  say @list if is-wave(@list);
+}
+
+sub is-wave(@list)
+{
+  my $current = @list[0];
+  my $greater = False;
+  
+  for @list[1 .. *] -> $next
+  {
+    if $greater
+    {
+      ($current = $next; return False) if $next < $current;
+    }
+    else
+    {
+      ($current = $next; return False) if $next > $current;
+    }
+    
+    $current = $next;
+    $greater = ! $greater;
+  }
+  return True;
+}
diff --git a/challenge-055/arne-sommer/raku/wave-array-hash b/challenge-055/arne-sommer/raku/wave-array-hash
new file mode 100755
index 0000000000..812425a9f8
--- /dev/null
+++ b/challenge-055/arne-sommer/raku/wave-array-hash
@@ -0,0 +1,40 @@
+#! /usr/bin/env raku
+
+unit sub MAIN (*@integers where all(@integers) ~~ Int, :$verbose);
+
+my %seen;
+
+for @integers.permutations -> @list
+{
+  my $seen = @list.join(",");
+
+  next if %seen{$seen};
+
+  say ": Checking @list[]" if $verbose;
+
+  say @list if is-wave(@list);
+
+  %seen{$seen} = True;
+}
+
+sub is-wave(@list)
+{
+  my $current = @list[0];
+  my $greater = False;
+  
+  for @list[1 .. *] -> $next
+  {
+    if $greater
+    {
+      ($current = $next; return False) if $next < $current;
+    }
+    else
+    {
+      ($current = $next; return False) if $next > $current;
+    }
+    
+    $current = $next;
+    $greater = ! $greater;
+  }
+  return True;
+}
diff --git a/challenge-055/arne-sommer/raku/wave-array-plain b/challenge-055/arne-sommer/raku/wave-array-plain
new file mode 100755
index 0000000000..f87023bae9
--- /dev/null
+++ b/challenge-055/arne-sommer/raku/wave-array-plain
@@ -0,0 +1,32 @@
+#! /usr/bin/env raku
+
+unit sub MAIN (*@integers where all(@integers) ~~ Int, :$verbose);
+
+for @integers.permutations -> @list
+{
+  say ": Checking @list[]" if $verbose;
+
+  say @list if is-wave(@list);
+}
+
+sub is-wave(@list)
+{
+  my $current = @list[0];
+  my $greater = False;
+  
+  for @list[1 .. *] -> $next
+  {
+    if $greater
+    {
+      ($current = $next; return False) if $next < $current;
+    }
+    else
+    {
+      ($current = $next; return False) if $next > $current;
+    }
+    
+    $current = $next;
+    $greater = ! $greater;
+  }
+  return True;
+}
diff --git a/stats/pwc-current.json b/stats/pwc-current.json
index 924b399ded..1690f352d6 100644
--- a/stats/pwc-current.json
+++ b/stats/pwc-current.json
@@ -1,72 +1,21 @@
 {
-   "yAxis" : {
-      "title" : {
-         "text" : "Total Solutions"
-      }
-   },
-   "plotOptions" : {
-      "series" : {
-         "dataLabels" : {
-            "enabled" : 1,
-            "format" : "{point.y}"
-         },
-         "borderWidth" : 0
-      }
-   },
-   "series" : [
-      {
-         "name" : "Perl Weekly Challenge - 055",
-         "data" : [
-            {
-               "name" : "Dave Jacoby",
-               "y" : 2,
-               "drilldown" : "Dave Jacoby"
-            },
-            {
-               "y" : 4,
-               "drilldown" : "Luca Ferrari",
-               "name" : "Luca Ferrari"
-            },
-            {
-               "y" : 2,
-               "drilldown" : "Mark Anderson",
-               "name" : "Mark Anderson"
-            },
-            {
-               "name" : "Roger Bell West",
-               "y" : 3,
-               "drilldown" : "Roger Bell West"
-            },
-            {
-               "name" : "Saif Ahmed",
-               "y" : 2,
-               "drilldown" : "Saif Ahmed"
-            },
-            {
-               "name" : "Simon Proctor",
-               "drilldown" : "Simon Proctor",
-               "y" : 2
-            },
-            {
-               "name" : "Wanderdoc",
-               "y" : 2,
-               "drilldown" : "Wanderdoc"
-            },
-            {
-               "drilldown" : "Yet Ebreo",
-               "y" : 2,
-               "name" : "Yet Ebreo"
-            }
-         ],
-         "colorByPoint" : 1
-      }
-   ],
-   "subtitle" : {
-      "text" : "[Champions: 8] Last updated at 2020-04-09 19:13:06 GMT"
-   },
    "drilldown" : {
       "series" : [
          {
+            "name" : "Arne Sommer",
+            "id" : "Arne Sommer",
+            "data" : [
+               [
+                  "Raku",
+                  2
+               ],
+               [
+                  "Blog",
+                  1
+               ]
+            ]
+         },
+         {
             "data" : [
                [
                   "Perl",
@@ -77,6 +26,8 @@
             "id" : "Dave Jacoby"
          },
          {
+            "id" : "Luca Ferrari",
+            "name" : "Luca Ferrari",
             "data" : [
                [
                   "Raku",
@@ -86,21 +37,21 @@
                   "Blog",
                   2
                ]
-            ],
-            "name" : "Luca Ferrari",
-            "id" : "Luca Ferrari"
+            ]
          },
          {
+            "id" : "Mark Anderson",
             "name" : "Mark Anderson",
             "data" : [
                [
                   "Raku",
                   2
                ]
-            ],
-            "id" : "Mark Anderson"
+            ]
          },
          {
+            "name" : "Roger Bell West",
+            "id" : "Roger Bell West",
             "data" : [
                [
                   "Perl",
@@ -110,67 +61,135 @@
                   "Raku",
                   1
                ]
-            ],
-            "name" : "Roger Bell West",
-            "id" : "Roger Bell West"
+            ]
          },
          {
             "id" : "Saif Ahmed",
+            "name" : "Saif Ahmed",
             "data" : [
                [
                   "Perl",
                   2
                ]
-            ],
-            "name" : "Saif Ahmed"
+            ]
          },
          {
             "id" : "Simon Proctor",
+            "name" : "Simon Proctor",
             "data" : [
                [
                   "Raku",
                   2
                ]
-            ],
-            "name" : "Simon Proctor"
+            ]
          },
          {
-            "id" : "Wanderdoc",
             "data" : [
                [
                   "Perl",
                   2
                ]
             ],
+            "id" : "Wanderdoc",
             "name" : "Wanderdoc"
          },
          {
             "id" : "Yet Ebreo",
+            "name" : "Yet Ebreo",
             "data" : [
                [
                   "Perl",
                   2
                ]
-            ],
-            "name" : "Yet Ebreo"
+            ]
          }
       ]
    },
-   "title" : {
-      "text" : "Perl Weekly Challenge - 055"
-   },
-   "xAxis" : {
-      "type" : "category"
-   },
-   "chart" : {
-      "type" : "column"
-   },
    "tooltip" : {
       "followPointer" : 1,
       "pointFormat" : "<span style='color:{point.color}'>{point.name}</span>: <b>{point.y:f}</b><br/>",
       "headerFormat" : "<span style='font-size:11px'>{series.name}</span><br/>"
    },
+   "chart" : {
+      "type" : "column"
+   },
+   "series" : [
+      {
+         "data" : [
+            {
+               "name" : "Arne Sommer",
+               "drilldown" : "Arne Sommer",
+               "y" : 3
+            },
+            {
+               "y" : 2,
+               "name" : "Dave Jacoby",
+               "drilldown" : "Dave Jacoby"
+            },
+            {
+               "y" : 4,
+               "drilldown" : "Luca Ferrari",
+               "name" : "Luca Ferrari"
+            },
+            {
+               "name" : "Mark Anderson",
+               "drilldown" : "Mark Anderson",
+               "y" : 2
+            },
+            {
+               "y" : 3,
+               "name" : "Roger Bell West",
+               "drilldown" : "Roger Bell West"
+            },
+            {
+               "y" : 2,
+               "name" : "Saif Ahmed",
+               "drilldown" : "Saif Ahmed"
+            },
+            {
+               "name" : "Simon Proctor",
+               "drilldown" : "Simon Proctor",
+               "y" : 2
+            },
+            {
+               "y" : 2,
+               "drilldown" : "Wanderdoc",
+               "name" : "Wanderdoc"
+            },
+            {
+               "y" : 2,
+               "drilldown" : "Yet Ebreo",
+               "name" : "Yet Ebreo"
+            }
+         ],
+         "colorByPoint" : 1,
+         "name" : "Perl Weekly Challenge - 055"
+      }
+   ],
+   "plotOptions" : {
+      "series" : {
+         "borderWidth" : 0,
+         "dataLabels" : {
+            "format" : "{point.y}",
+            "enabled" : 1
+         }
+      }
+   },
    "legend" : {
       "enabled" : 0
+   },
+   "yAxis" : {
+      "title" : {
+         "text" : "Total Solutions"
+      }
+   },
+   "xAxis" : {
+      "type" : "category"
+   },
+   "subtitle" : {
+      "text" : "[Champions: 9] Last updated at 2020-04-09 19:27:48 GMT"
+   },
+   "title" : {
+      "text" : "Perl Weekly Challenge - 055"
    }
 }
diff --git a/stats/pwc-language-breakdown-summary.json b/stats/pwc-language-breakdown-summary.json
index a8da2ce2ea..57238a428f 100644
--- a/stats/pwc-language-breakdown-summary.json
+++ b/stats/pwc-language-breakdown-summary.json
@@ -1,10 +1,41 @@
 {
+   "legend" : {
+      "enabled" : "false"
+   },
+   "title" : {
+      "text" : "Perl Weekly Challenge Contributions [2019 - 2020]"
+   },
+   "subtitle" : {
+      "text" : "Last updated at 2020-04-09 19:27:48 GMT"
+   },
+   "yAxis" : {
+      "title" : {
+         "text" : null
+      },
+      "min" : 0
+   },
+   "xAxis" : {
+      "labels" : {
+         "style" : {
+            "fontFamily" : "Verdana, sans-serif",
+            "fontSize" : "13px"
+         }
+      },
+      "type" : "category"
+   },
+   "chart" : {
+      "type" : "column"
+   },
+   "tooltip" : {
+      "pointFormat" : "<b>{point.y:.0f}</b>"
+   },
    "series" : [
       {
+         "name" : "Contributions",
          "data" : [
             [
                "Blog",
-               600
+               601
             ],
             [
                "Perl",
@@ -12,52 +43,21 @@
             ],
             [
                "Raku",
-               1440
+               1442
             ]
          ],
          "dataLabels" : {
+            "enabled" : "true",
+            "rotation" : -90,
             "style" : {
                "fontSize" : "13px",
                "fontFamily" : "Verdana, sans-serif"
             },
-            "enabled" : "true",
-            "y" : 10,
             "color" : "#FFFFFF",
             "align" : "right",
             "format" : "{point.y:.0f}",
-            "rotation" : -90
-         },
-         "name" : "Contributions"
-      }
-   ],
-   "yAxis" : {
-      "title" : {
-         "text" : null
-      },
-      "min" : 0
-   },
-   "xAxis" : {
-      "type" : "category",
-      "labels" : {
-         "style" : {
-            "fontFamily" : "Verdana, sans-serif",
-            "fontSize" : "13px"
+            "y" : 10
          }
       }
-   },
-   "subtitle" : {
-      "text" : "Last updated at 2020-04-09 19:13:06 GMT"
-   },
-   "title" : {
-      "text" : "Perl Weekly Challenge Contributions [2019 - 2020]"
-   },
-   "chart" : {
-      "type" : "column"
-   },
-   "legend" : {
-      "enabled" : "false"
-   },
-   "tooltip" : {
-      "pointFormat" : "<b>{point.y:.0f}</b>"
-   }
+   ]
 }
diff --git a/stats/pwc-language-breakdown.json b/stats/pwc-language-breakdown.json
index bb7f8094f4..af51969315 100644
--- a/stats/pwc-language-breakdown.json
+++ b/stats/pwc-language-breakdown.json
@@ -1,13 +1,12 @@
 {
-   "xAxis" : {
-      "type" : "category"
-   },
-   "title" : {
-      "text" : "Perl Weekly Challenge Language"
+   "chart" : {
+      "type" : "column"
    },
    "drilldown" : {
       "series" : [
          {
+            "name" : "001",
+            "id" : "001",
             "data" : [
                [
                   "Perl",
@@ -21,13 +20,9 @@
                   "Blog",
                   11
                ]
-            ],
-            "name" : "001",
-            "id" : "001"
+            ]
          },
          {
-            "id" : "002",
-            "name" : "002",
             "data" : [
                [
                   "Perl",
@@ -41,10 +36,11 @@
                   "Blog",
                   10
                ]
-            ]
+            ],
+            "id" : "002",
+            "name" : "002"
          },
          {
-            "name" : "003",
             "data" : [
                [
                   "Perl",
@@ -59,10 +55,12 @@
                   9
                ]
             ],
+            "name" : "003",
             "id" : "003"
          },
          {
             "id" : "004",
+            "name" : "004",
             "data" : [
                [
                   "Perl",
@@ -76,12 +74,9 @@
                   "Blog",
                   10
                ]
-            ],
-            "name" : "004"
+            ]
          },
          {
-            "id" : "005",
-            "name" : "005",
             "data" : [
                [
                   "Perl",
@@ -95,7 +90,9 @@
                   "Blog",
                   12
                ]
-            ]
+            ],
+            "id" : "005",
+            "name" : "005"
          },
          {
             "data" : [
@@ -112,8 +109,8 @@
                   7
                ]
             ],
-            "name" : "006",
-            "id" : "006"
+            "id" : "006",
+            "name" : "006"
          },
          {
             "data" : [
@@ -152,7 +149,6 @@
             ]
          },
          {
-            "name" : "009",
             "data" : [
                [
                   "Perl",
@@ -167,10 +163,12 @@
                   13
                ]
             ],
+            "name" : "009",
             "id" : "009"
          },
          {
             "id" : "010",
+            "name" : "010",
             "data" : [
                [
                   "Perl",
@@ -184,11 +182,9 @@
                   "Blog",
                   11
                ]
-            ],
-            "name" : "010"
+            ]
          },
          {
-            "name" : "011",
             "data" : [
                [
                   "Perl",
@@ -203,9 +199,12 @@
                   10
                ]
             ],
-            "id" : "011"
+            "id" : "011",
+            "name" : "011"
          },
          {
+            "name" : "012",
+            "id" : "012",
             "data" : [
                [
                   "Perl",
@@ -219,13 +218,11 @@
                   "Blog",
                   11
                ]
-            ],
-            "name" : "012",
-            "id" : "012"
+            ]
          },
          {
-            "id" : "013",
             "name" : "013",
+            "id" : "013",
             "data" : [
                [
                   "Perl",
@@ -242,8 +239,8 @@
             ]
          },
          {
-            "id" : "014",
             "name" : "014",
+            "id" : "014",
             "data" : [
                [
                   "Perl",
@@ -260,6 +257,8 @@
             ]
          },
          {
+            "name" : "015",
+            "id" : "015",
             "data" : [
                [
                   "Perl",
@@ -273,9 +272,7 @@
                   "Blog",
                   15
                ]
-            ],
-            "name" : "015",
-            "id" : "015"
+            ]
          },
          {
             "data" : [
@@ -292,12 +289,10 @@
                   12
                ]
             ],
-            "name" : "016",
-            "id" : "016"
+            "id" : "016",
+            "name" : "016"
          },
          {
-            "id" : "017",
-            "name" : "017",
             "data" : [
                [
                   "Perl",
@@ -311,9 +306,12 @@
                   "Blog",
                   12
                ]
-            ]
+            ],
+            "name" : "017",
+            "id" : "017"
          },
          {
+            "name" : "018",
             "id" : "018",
             "data" : [
                [
@@ -328,12 +326,9 @@
                   "Blog",
                   14
                ]
-            ],
-            "name" : "018"
+            ]
          },
          {
-            "id" : "019",
-            "name" : "019",
             "data" : [
                [
                   "Perl",
@@ -347,10 +342,11 @@
                   "Blog",
                   13
                ]
-            ]
+            ],
+            "id" : "019",
+            "name" : "019"
          },
          {
-            "name" : "020",
             "data" : [
                [
                   "Perl",
@@ -365,9 +361,11 @@
                   13
                ]
             ],
+            "name" : "020",
             "id" : "020"
          },
          {
+            "id" : "021",
             "name" : "021",
             "data" : [
                [
@@ -382,12 +380,9 @@
                   "Blog",
                   10
                ]
-            ],
-            "id" : "021"
+            ]
          },
          {
-            "id" : "022",
-            "name" : "022",
             "data" : [
                [
                   "Perl",
@@ -401,7 +396,9 @@
                   "Blog",
                   10
                ]
-            ]
+            ],
+            "id" : "022",
+            "name" : "022"
          },
          {
             "data" : [
@@ -418,11 +415,12 @@
                   12
                ]
             ],
-            "name" : "023",
-            "id" : "023"
+            "id" : "023",
+            "name" : "023"
          },
          {
             "name" : "024",
+            "id" : "024",
             "data" : [
                [
                   "Perl",
@@ -436,11 +434,9 @@
                   "Blog",
                   11
                ]
-            ],
-            "id" : "024"
+            ]
          },
          {
-            "id" : "025",
             "data" : [
                [
                   "Perl",
@@ -455,9 +451,12 @@
                   12
                ]
             ],
+            "id" : "025",
             "name" : "025"
          },
          {
+            "id" : "026",
+            "name" : "026",
             "data" : [
                [
                   "Perl",
@@ -471,13 +470,11 @@
                   "Blog",
                   10
                ]
-            ],
-            "name" : "026",
-            "id" : "026"
+            ]
          },
          {
-            "id" : "027",
             "name" : "027",
+            "id" : "027",
             "data" : [
                [
                   "Perl",
@@ -495,6 +492,7 @@
          },
          {
             "name" : "028",
+            "id" : "028",
             "data" : [
                [
                   "Perl",
@@ -508,11 +506,9 @@
                   "Blog",
                   9
                ]
-            ],
-            "id" : "028"
+            ]
          },
          {
-            "id" : "029",
             "data" : [
                [
                   "Perl",
@@ -527,6 +523,7 @@
                   12
                ]
             ],
+            "id" : "029",
             "name" : "029"
          },
          {
@@ -548,8 +545,6 @@
             ]
          },
          {
-            "id" : "031",
-            "name" : "031",
             "data" : [
                [
                   "Perl",
@@ -563,10 +558,11 @@
                   "Blog",
                   9
                ]
-            ]
+            ],
+            "name" : "031",
+            "id" : "031"
          },
          {
-            "name" : "032",
             "data" : [
                [
                   "Perl",
@@ -581,7 +577,8 @@
                   10
                ]
             ],
-            "id" : "032"
+            "id" : "032",
+            "name" : "032"
          },
          {
             "data" : [
@@ -598,8 +595,8 @@
                   10
                ]
             ],
-            "name" : "033",
-            "id" : "033"
+            "id" : "033",
+            "name" : "033"
          },
          {
             "id" : "034",
@@ -620,7 +617,6 @@
             ]
          },
          {
-            "name" : "035",
             "data" : [
                [
                   "Perl",
@@ -635,7 +631,8 @@
                   9
                ]
             ],
-            "id" : "035"
+            "id" : "035",
+            "name" : "035"
          },
          {
             "id" : "036",
@@ -657,6 +654,7 @@
          },
          {
             "name" : "037",
+            "id" : "037",
             "data" : [
                [
                   "Perl",
@@ -670,11 +668,11 @@
                   "Blog",
                   9
                ]
-            ],
-            "id" : "037"
+            ]
          },
          {
             "name" : "038",
+            "id" : "038",
             "data" : [
                [
                   "Perl",
@@ -688,12 +68