- Added solutions by Colin Crain.

15 files changed, 1232 insertions, 960 deletions

diff --git a/challenge-069/colin-crain/perl/ch-1.pl b/challenge-069/colin-crain/perl/ch-1.pl
new file mode 100644
index 0000000000..c1a3c8d434
--- /dev/null
+++ b/challenge-069/colin-crain/perl/ch-1.pl
@@ -0,0 +1,92 @@
+#! /opt/local/bin/perl
+#
+#       stroboscope.pl
+#
+#         TASK #1 › Strobogrammatic Number
+#         Submitted by: Mohammad S Anwar
+#             A strobogrammatic number is a number that looks the same
+#             when looked at upside down.
+#
+#             You are given two positive numbers $A and $B such that
+#                 1 <= $A <= $B <= 10^15.
+#
+#             Write a script to print all strobogrammatic numbers
+#             between the given two numbers.
+#
+#         Example
+#             Input:  $A = 50, $B = 100
+#             Output: 69, 88, 96
+#
+#       2020 colin crain
+## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ##
+
+
+
+use warnings;
+use strict;
+use feature ":5.26";
+
+## ## ## ## ## MAIN:
+
+my ($A, $B) = @ARGV;                  ## low, high bounds
+# ($A, $B) = (1000, 2000000000);
+# the order is the length of the half number that is modified and
+# joined to itself, with or without the pivot digit in the center.
+# Thus a given order will generate numbers up to 2n+1 places long, or
+# 10^(2n+1) The order is calculated to theoretically create numbers as
+# large as B. As this value scales by magnitude 100, this number can
+# be quite a bit larger, but will larger and we can guarantee none of
+# the next larger order will be required. It serves as an upper bound
+# to the calculation space.
+my $order  = int(length($B)/2);
+
+my @list   = (0, 1, 6, 8, 9);
+my @center = (0, 1, 8);
+
+my @num    = @list[1..@list-1];       ## remove leading 0
+my @stereo = grep { $_ >= $A && $_ <= $B } @center;                 ## single digit cases
+
+OUTER: for (0..$order-1) {
+    my @evens = my @odds  = ();       ## reset holding arrays
+
+    for my $left (@num) {
+        my $right = reverse($left =~ tr/69/96/r);
+
+            my $even = "$left$right";
+            if ($even > $B) {
+                push @stereo, @evens, @odds;      ## keeps things sorted
+                last OUTER;
+            }
+            push @evens, $even unless $even < $A;
+
+        for my $center (@center) {
+            my $odd = "$left$center$right";
+            last if $odd > $B;
+            next if $odd < $A;
+            push @odds, $odd;
+        }
+    }
+
+
+    ## add another digit to the working list
+    @num = map { my $c = $_; map "$c$_", @list } @num;
+}
+
+# for ( @stereo ) {
+#     next if $_ < $A;
+#     last if $_ > $B;
+#     say $_;
+# }
+
+say $_ for @stereo;
+
+
+
+
+## ## ## ## ## SUBS:
+
+## included because I wanted to write a regex to find these numbers,
+## but an impractical method in the end.
+sub is_strobogrammatic {
+    $_[0] =~ m/^([16890]*)[180]?((??{reverse($1=~tr[69][96]r)}))$/ ? 1 : 0
+}
diff --git a/challenge-069/colin-crain/perl/ch-2.pl b/challenge-069/colin-crain/perl/ch-2.pl
new file mode 100644
index 0000000000..a0134f39fe
--- /dev/null
+++ b/challenge-069/colin-crain/perl/ch-2.pl
@@ -0,0 +1,54 @@
+#! /opt/local/bin/perl
+#
+#       one-zero-zero-one.pl
+#
+#         TASK #2 › 0/1 String
+#         Submitted by: Mohammad S Anwar
+#             A 0/1 string is a string in which every character is
+#             either 0 or 1.
+#
+#             Write a script to perform switch and reverse to generate
+#             S30 as described below:
+#
+#             switch:
+#
+#                 Every 0 becomes 1 and every 1 becomes 0. For example,
+#                 “101” becomes “010”.
+#
+#             reverse:
+#
+#                 The string is reversed. For example, "001” becomes
+#                 “100”.
+#
+#             Please follow the rule as below:
+#
+#                 S0 = “”
+#                 S1 = “0”
+#                 S2 = “001”
+#                 S3 = “0010011”
+#                 …
+#                 SN = SN-1 + “0” + switch(reverse(SN-1))
+#
+#
+#       2020 colin crain
+## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ##
+
+
+
+use warnings;
+use strict;
+use feature ":5.26";
+
+## ## ## ## ## MAIN:
+
+my $num = $ARGV[0] // 7;
+say S($num);
+
+## ## ## ## ## SUBS:
+
+sub S {
+    my $n = shift;
+    return '' if $n == 0;
+    my $str = S ($n-1);
+    return $str . '0' . reverse( $str =~ tr/01/10/r );
+}
diff --git a/challenge-069/colin-crain/raku/ch-1.p6 b/challenge-069/colin-crain/raku/ch-1.p6
new file mode 100644
index 0000000000..cd240d4794
--- /dev/null
+++ b/challenge-069/colin-crain/raku/ch-1.p6
@@ -0,0 +1,60 @@
+#!/usr/bin/env perl6
+#
+#
+#       stroboscope.raku
+#
+#         TASK #1 › Strobogrammatic Number
+#         Submitted by: Mohammad S Anwar
+#             A strobogrammatic number is a number that looks the same
+#             when looked at upside down.
+#
+#             You are given two positive numbers $A and $B such that
+#                 1 <= $A <= $B <= 10^15.
+#
+#             Write a script to print all strobogrammatic numbers
+#             between the given two numbers.
+#
+#         Example
+#             Input:  $A = 50, $B = 100
+#             Output: 69, 88, 96
+#
+#       2020 colin crain
+## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ##
+
+
+
+sub MAIN (Int $A = 96, Int $B = 100001) {
+
+    my $order  = ($B.chars/2).Int;    ## numbers up to 10^(2*$order+1) are generated
+
+    my @list   = 0, 1, 6, 8, 9;
+    my @center = 0, 1, 8;
+
+    my @num    = @list.tail(*-1);     ## remove leading 0       ## thanks, Liz!
+    my @stereo = @center;             ## ensures trivial single digit cases
+
+    for ^$order {
+        my @evens = Empty;
+        my @odds  = Empty;   ## reset holding arrays
+
+        for @num -> $left {
+            my $right = $left.trans( '69' => '96' ).flip;
+               @evens.push: ($left, $right).join;
+
+            for @center -> $c {
+                @odds.push: ($left, $right).join: "$c";
+            }
+        }
+        @stereo.append: @evens;
+        @stereo.append: @odds;
+
+        ## add another digit to the working list
+        @num = [X~] @num, @list;
+    }
+
+    for @stereo {
+        next when $_ < $A;
+        last when $_ > $B;
+        .say;
+    }
+}
diff --git a/challenge-069/colin-crain/raku/ch-2.p6 b/challenge-069/colin-crain/raku/ch-2.p6
new file mode 100644
index 0000000000..d1240ac095
--- /dev/null
+++ b/challenge-069/colin-crain/raku/ch-2.p6
@@ -0,0 +1,47 @@
+#!/usr/bin/env perl6
+#
+#
+#       one-zero-zero-one.raku
+#
+#         TASK #2 › 0/1 String
+#         Submitted by: Mohammad S Anwar
+#             A 0/1 string is a string in which every character is
+#             either 0 or 1.
+#
+#             Write a script to perform switch and reverse to generate
+#             S30 as described below:
+#
+#             switch:
+#
+#                 Every 0 becomes 1 and every 1 becomes 0. For example,
+#                 “101” becomes “010”.
+#
+#             reverse:
+#
+#                 The string is reversed. For example, "001” becomes
+#                 “100”.
+#
+#             Please follow the rule as below:
+#
+#                 S0 = “”
+#                 S1 = “0”
+#                 S2 = “001”
+#                 S3 = “0010011”
+#                 …
+#                 SN = SN-1 + “0” + switch(reverse(SN-1))
+#
+#
+#       2020 colin crain
+## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ##
+
+
+
+sub MAIN ( Int $n = 26) {
+    S($n).say;
+}
+
+sub S ($n) {
+    return '' unless $n;
+    my $str = S($n-1);
+    $str ~ '0' ~ $str.trans('01'=>'10').flip;
+}
diff --git a/stats/pwc-current.json b/stats/pwc-current.json
index 02bd317bee..c20be73eb5 100644
--- a/stats/pwc-current.json
+++ b/stats/pwc-current.json
@@ -1,11 +1,10 @@
 {
-   "xAxis" : {
-      "type" : "category"
+   "title" : {
+      "text" : "Perl Weekly Challenge - 069"
    },
    "drilldown" : {
       "series" : [
          {
-            "name" : "Andrew Shitov",
             "data" : [
                [
                   "Raku",
@@ -16,26 +15,41 @@
                   1
                ]
             ],
+            "name" : "Andrew Shitov",
             "id" : "Andrew Shitov"
          },
          {
             "id" : "Bartosz Jarzyna",
+            "name" : "Bartosz Jarzyna",
             "data" : [
                [
                   "Perl",
                   1
                ]
-            ],
-            "name" : "Bartosz Jarzyna"
+            ]
+         },
+         {
+            "id" : "Colin Crain",
+            "name" : "Colin Crain",
+            "data" : [
+               [
+                  "Perl",
+                  2
+               ],
+               [
+                  "Raku",
+                  2
+               ]
+            ]
          },
          {
-            "name" : "Dave Jacoby",
             "data" : [
                [
                   "Perl",
                   2
                ]
             ],
+            "name" : "Dave Jacoby",
             "id" : "Dave Jacoby"
          },
          {
@@ -45,18 +59,18 @@
                   2
                ]
             ],
-            "id" : "Duncan C. White",
-            "name" : "Duncan C. White"
+            "name" : "Duncan C. White",
+            "id" : "Duncan C. White"
          },
          {
-            "name" : "E. Choroba",
-            "id" : "E. Choroba",
             "data" : [
                [
                   "Perl",
                   2
                ]
-            ]
+            ],
+            "name" : "E. Choroba",
+            "id" : "E. Choroba"
          },
          {
             "data" : [
@@ -73,18 +87,18 @@
                   1
                ]
             ],
-            "id" : "Javier Luque",
-            "name" : "Javier Luque"
+            "name" : "Javier Luque",
+            "id" : "Javier Luque"
          },
          {
             "id" : "Jorg Sommrey",
+            "name" : "Jorg Sommrey",
             "data" : [
                [
                   "Perl",
                   2
                ]
-            ],
-            "name" : "Jorg Sommrey"
+            ]
          },
          {
             "name" : "Luca Ferrari",
@@ -101,7 +115,6 @@
             "id" : "Luca Ferrari"
          },
          {
-            "name" : "Mohammad S Anwar",
             "data" : [
                [
                   "Perl",
@@ -116,30 +129,30 @@
                   2
                ]
             ],
+            "name" : "Mohammad S Anwar",
             "id" : "Mohammad S Anwar"
          },
          {
+            "id" : "Niels van Dijke",
             "name" : "Niels van Dijke",
             "data" : [
                [
                   "Perl",
                   2
                ]
-            ],
-            "id" : "Niels van Dijke"
+            ]
          },
          {
-            "name" : "Pete Houston",
             "id" : "Pete Houston",
             "data" : [
                [
                   "Perl",
                   1
                ]
-            ]
+            ],
+            "name" : "Pete Houston"
          },
          {
-            "name" : "Roger Bell_West",
             "data" : [
                [
                   "Perl",
@@ -154,9 +167,11 @@
                   1
                ]
             ],
+            "name" : "Roger Bell_West",
             "id" : "Roger Bell_West"
          },
          {
+            "name" : "Simon Green",
             "data" : [
                [
                   "Perl",
@@ -167,20 +182,20 @@
                   1
                ]
             ],
-            "id" : "Simon Green",
-            "name" : "Simon Green"
+            "id" : "Simon Green"
          },
          {
-            "name" : "Simon Miner",
+            "id" : "Simon Miner",
             "data" : [
                [
                   "Perl",
                   1
                ]
             ],
-            "id" : "Simon Miner"
+            "name" : "Simon Miner"
          },
          {
+            "id" : "Ulrich Rieke",
             "name" : "Ulrich Rieke",
             "data" : [
                [
@@ -191,22 +206,21 @@
                   "Raku",
                   2
                ]
-            ],
-            "id" : "Ulrich Rieke"
+            ]
          },
          {
             "name" : "Walt Mankowski",
-            "id" : "Walt Mankowski",
             "data" : [
                [
                   "Perl",
                   2
                ]
-            ]
+            ],
+            "id" : "Walt Mankowski"
          },
          {
-            "name" : "Wanderdoc",
             "id" : "Wanderdoc",
+            "name" : "Wanderdoc",
             "data" : [
                [
                   "Perl",
@@ -216,15 +230,6 @@
          }
       ]
    },
-   "plotOptions" : {
-      "series" : {
-         "borderWidth" : 0,
-         "dataLabels" : {
-            "format" : "{point.y}",
-            "enabled" : 1
-         }
-      }
-   },
    "chart" : {
       "type" : "column"
    },
@@ -233,6 +238,20 @@
          "text" : "Total Solutions"
       }
    },
+   "tooltip" : {
+      "pointFormat" : "<span style='color:{point.color}'>{point.name}</span>: <b>{point.y:f}</b><br/>",
+      "followPointer" : 1,
+      "headerFormat" : "<span style='font-size:11px'>{series.name}</span><br/>"
+   },
+   "plotOptions" : {
+      "series" : {
+         "borderWidth" : 0,
+         "dataLabels" : {
+            "enabled" : 1,
+            "format" : "{point.y}"
+         }
+      }
+   },
    "legend" : {
       "enabled" : 0
    },
@@ -242,73 +261,78 @@
          "name" : "Perl Weekly Challenge - 069",
          "data" : [
             {
-               "drilldown" : "Andrew Shitov",
                "name" : "Andrew Shitov",
-               "y" : 3
+               "y" : 3,
+               "drilldown" : "Andrew Shitov"
             },
             {
-               "y" : 1,
                "name" : "Bartosz Jarzyna",
+               "y" : 1,
                "drilldown" : "Bartosz Jarzyna"
             },
             {
+               "y" : 4,
+               "drilldown" : "Colin Crain",
+               "name" : "Colin Crain"
+            },
+            {
                "name" : "Dave Jacoby",
                "drilldown" : "Dave Jacoby",
                "y" : 2
             },
             {
-               "drilldown" : "Duncan C. White",
                "name" : "Duncan C. White",
-               "y" : 2
+               "y" : 2,
+               "drilldown" : "Duncan C. White"
             },
             {
-               "drilldown" : "E. Choroba",
                "name" : "E. Choroba",
+               "drilldown" : "E. Choroba",
                "y" : 2
             },
             {
-               "y" : 5,
                "name" : "Javier Luque",
-               "drilldown" : "Javier Luque"
+               "drilldown" : "Javier Luque",
+               "y" : 5
             },
             {
+               "drilldown" : "Jorg Sommrey",
                "y" : 2,
-               "name" : "Jorg Sommrey",
-               "drilldown" : "Jorg Sommrey"
+               "name" : "Jorg Sommrey"
             },
             {
-               "drilldown" : "Luca Ferrari",
                "name" : "Luca Ferrari",
-               "y" : 4
+               "y" : 4,
+               "drilldown" : "Luca Ferrari"
             },
             {
                "drilldown" : "Mohammad S Anwar",
-               "name" : "Mohammad S Anwar",
-               "y" : 6
+               "y" : 6,
+               "name" : "Mohammad S Anwar"
             },
             {
-               "drilldown" : "Niels van Dijke",
                "name" : "Niels van Dijke",
-               "y" : 2
+               "y" : 2,
+               "drilldown" : "Niels van Dijke"
             },
             {
-               "y" : 1,
+               "name" : "Pete Houston",
                "drilldown" : "Pete Houston",
-               "name" : "Pete Houston"
+               "y" : 1
             },
             {
                "y" : 5,
-               "name" : "Roger Bell_West",
-               "drilldown" : "Roger Bell_West"
+               "drilldown" : "Roger Bell_West",
+               "name" : "Roger Bell_West"
             },
             {
                "name" : "Simon Green",
-               "drilldown" : "Simon Green",
-               "y" : 3
+               "y" : 3,
+               "drilldown" : "Simon Green"
             },
             {
-               "drilldown" : "Simon Miner",
                "name" : "Simon Miner",
+               "drilldown" : "Simon Miner",
                "y" : 1
             },
             {
@@ -317,27 +341,22 @@
                "y" : 4
             },
             {
-               "drilldown" : "Walt Mankowski",
                "name" : "Walt Mankowski",
+               "drilldown" : "Walt Mankowski",
                "y" : 2
             },
             {
-               "y" : 2,
                "name" : "Wanderdoc",
+               "y" : 2,
                "drilldown" : "Wanderdoc"
             }
          ]
       }
    ],
-   "tooltip" : {
-      "headerFormat" : "<span style='font-size:11px'>{series.name}</span><br/>",
-      "pointFormat" : "<span style='color:{point.color}'>{point.name}</span>: <b>{point.y:f}</b><br/>",
-      "followPointer" : 1
-   },
    "subtitle" : {
-      "text" : "[Champions: 17] Last updated at 2020-07-18 15:47:33 GMT"
+      "text" : "[Champions: 18] Last updated at 2020-07-18 16:01:02 GMT"
    },
-   "title" : {
-      "text" : "Perl Weekly Challenge - 069"
+   "xAxis" : {
+      "type" : "category"
    }
 }
diff --git a/stats/pwc-language-breakdown-summary.json b/stats/pwc-language-breakdown-summary.json
index c9857e49fb..b83c737e09 100644
--- a/stats/pwc-language-breakdown-summary.json
+++ b/stats/pwc-language-breakdown-summary.json
@@ -1,18 +1,13 @@
 {
-   "xAxis" : {
-      "type" : "category",
-      "labels" : {
-         "style" : {
-            "fontSize" : "13px",
-            "fontFamily" : "Verdana, sans-serif"
-         }
-      }
+   "tooltip" : {
+      "pointFormat" : "<b>{point.y:.0f}</b>"
    },
-   "chart" : {
-      "type" : "column"
+   "legend" : {
+      "enabled" : "false"
    },
    "series" : [
       {
+         "name" : "Contributions",
          "data" : [
             [
                "Blog",
@@ -20,44 +15,49 @@
             ],
             [
                "Perl",
-               2847
+               2849
             ],
             [
                "Raku",
-               1820
+               1822
             ]
          ],
-         "name" : "Contributions",
          "dataLabels" : {
+            "rotation" : -90,
             "style" : {
-               "fontFamily" : "Verdana, sans-serif",
-               "fontSize" : "13px"
+               "fontSize" : "13px",
+               "fontFamily" : "Verdana, sans-serif"
             },
+            "align" : "right",
             "format" : "{point.y:.0f}",
-            "rotation" : -90,
             "y" : 10,
-            "align" : "right",
             "color" : "#FFFFFF",
             "enabled" : "true"
          }
       }
    ],
-   "yAxis" : {
-      "min" : 0,
-      "title" : {
-         "text" : null
-      }
+   "subtitle" : {
+      "text" : "Last updated at 2020-07-18 16:01:02 GMT"
    },
-   "legend" : {
-      "enabled" : "false"
+   "xAxis" : {
+      "labels" : {
+         "style" : {
+            "fontSize" : "13px",
+            "fontFamily" : "Verdana, sans-serif"
+         }
+      },
+      "type" : "category"
    },
    "title" : {
       "text" : "Perl Weekly Challenge Contributions [2019 - 2020]"
    },
-   "tooltip" : {
-      "pointFormat" : "<b>{point.y:.0f}</b>"
+   "chart" : {
+      "type" : "column"
    },
-   "subtitle" : {
-      "text" : "Last updated at 2020-07-18 15:47:33 GMT"
+   "yAxis" : {
+      "min" : 0,
+      "title" : {
+         "text" : null
+      }
    }
 }
diff --git a/stats/pwc-language-breakdown.json b/stats/pwc-language-breakdown.json
index d21f185dd9..abf89a6fc8 100644
--- a/stats/pwc-language-breakdown.json
+++ b/stats/pwc-language-breakdown.json
@@ -1,50 +1,51 @@
 {
-   "subtitle" : {
-      "text" : "Click the columns to drilldown the language breakdown. Last updated at 2020-07-18 15:47:33 GMT"
+   "legend" : {
+      "enabled" : "false"
+   },
+   "plotOptions" : {
+      "series" : {
+         "borderWidth" : 0,
+         "dataLabels" : {
+            "format" : "{point.y}",
+            "enabled" : 1
+         }
+      }
    },
    "tooltip" : {
+      "followPointer" : "true",
       "headerFormat" : "<span style=\"font-size:11px\"></span>",
-      "pointFormat" : "<span style=\"color:{point.color}\">Challenge {point.name}</span>: <b>{point.y:f}</b><br/>",
-      "followPointer" : "true"
+      "pointFormat" : "<span style=\"color:{point.color}\">Challenge {point.name}</span>: <b>{point.y:f}</b><br/>"
    },
-   "title" : {
-      "text" : "Perl Weekly Challenge Language"
-   },
-   "yAxis" : {
-      "title" : {
-         "text" : "Total Solutions"
-      }
-   },
-   "legend" : {
-      "enabled" : "false"
+   "xAxis" : {
+      "type" : "category"
    },
    "series" : [
       {
          "data" : [
             {
-               "y" : 142,
                "name" : "#001",
+               "y" : 142,
                "drilldown" : "001"
             },
             {
                "drilldown" : "002",
-               "name" : "#002",
-               "y" : 109
+               "y" : 109,
+               "name" : "#002"
             },
             {
                "name" : "#003",
-               "drilldown" : "003",
-               "y" : 71
+               "y" : 71,
+               "drilldown" : "003"
             },
             {
-               "y" : 91,
                "name" : "#004",
-               "drilldown" : "004"
+               "drilldown" : "004",
+               "y" : 91
             },
             {
+               "drilldown" : "005",
                "y" : 72,
-               "name" : "#005",
-               "drilldown" : "005"
+               "name" : "#005"
             },
             {
                "name" : "#006",
@@ -53,63 +54,63 @@
             },
             {
                "name" : "#007",
-               "drilldown" : "007",
-               "y" : 59
+               "y" : 59,
+               "drilldown" : "007"
             },
             {
-               "y" : 72,
                "drilldown" : "008",
+               "y" : 72,
                "name" : "#008"
             },
             {
-               "y" : 68,
                "name" : "#009",
+               "y" : 68,
                "drilldown" : "009"
             },
             {
-               "drilldown" : "010",
                "name" : "#010",
-               "y" : 60
+               "y" : 60,
+               "drilldown" : "010"
             },
             {
-               "y" : 79,
                "drilldown" : "011",
+               "y" : 79,
                "name" : "#011"
             },
             {
-               "y" : 83,
+               "name" : "#012",
                "drilldown" : "012",
-               "name" : "#012"
+               "y" : 83
             },
             {
                "y" : 76,
-               "name" : "#013",
-               "drilldown" : "013"
+               "drilldown" : "013",
+               "name" : "#013"
             },
             {
+               "name" : "#014",
                "y" : 96,
-               "drilldown" : "014",
-               "name" : "#014"
+               "drilldown" : "014"
             },
             {
-               "name" : "#015",
+               "y" : 93,
                "drilldown" : "015",
-               "y" : 93
+               "name" : "#015"
             },
             {
+               "drilldown" : "016",
                "y" : 66,
-               "name" : "#016",
-               "drilldown" : "016"
+               "name" : "#016"
             },
             {
-               "drilldown" : "017",
                "name" : "#017",
-               "y" : 79
+               "y" : 79,
+               "drilldown" : "017"
             },
             {
+               "y" : 76,
                "drilldown" : "018",
-               "name" : "#018",
-               "y" : 76
+               "name" : "#018"
             },
             {
                "y" : 97,
@@ -117,19 +118,19 @@
                "name" : "#019"
             },
             {
+               "y" : 95,
                "drilldown" : "020",
-               "name" : "#020",
-               "y" : 95
+               "name" : "#020"
             },
             {
                "name" : "#021",
-               "drilldown" : "021",
-               "y" : 67
+               "y" : 67,
+               "drilldown" : "021"
             },
             {
-               "drilldown" : "022",
                "name" : "#022",
-               "y" : 63
+               "y" : 63,
+               "drilldown" : "022"
             },
             {
                "name" : "#023",
@@ -137,14 +138,14 @@
                "y" : 91
             },
             {
-               "y" : 70,
+               "name" : "#024",
                "drilldown" : "024",
-               "name" : "#024"
+               "y" : 70
             },
             {
-               "y" : 55,
+               "name" : "#025",
                "drilldown" : "025",
-               "name" : "#025"
+               "y" : 55
             },
             {
                "name" : "#026",
@@ -158,32 +159,32 @@
             },
             {
                "name" : "#028",
-               "drilldown" : "028",
-               "y" : 78
+               "y" : 78,
+               "drilldown" : "028"
             },
             {
-               "y" : 77,
+               "name" : "#029",
                "drilldown" : "029",
-               "name" : "#029"
+               "y" : 77
             },
             {
+               "name" : "#030",
                "y" : 115,
-               "drilldown" : "030",
-               "name" : "#030"
+               "drilldown" : "030"
             },
             {
-               "y" : 87,
                "name" : "#031",
-               "drilldown" : "031"
+               "drilldown" : "031",
+               "y" : 87
             },
             {
-               "y" : 92,
                "name" : "#032",
-               "drilldown" : "032"
+               "drilldown" : "032",
+               "y" : 92
             },
             {
-               "y" : 108,
                "drilldown" : "033",
+               "y" : 108,
                "name" : "#033"
             },
             {
@@ -193,8 +194,8 @@
             },
             {
                "drilldown" : "035",
-               "name" : "#035",
-               "y" : 62
+               "y" : 62,
+               "name" : "#035"
             },
             {
                "y" : 66,
@@ -207,94 +208,94 @@
                "y" : 65
             },
             {
-               "name" : "#038",
+               "y" : 65,
                "drilldown" : "038",
-               "y" : 65
+               "name" : "#038"
             },
             {
-               "drilldown" : "039",
                "name" : "#039",
-               "y" : 60
+               "y" : 60,
+               "drilldown" : "039"
             },
             {
                "name" : "#040",
-               "drilldown" : "040",
-               "y" : 71
+               "y" : 71,
+               "drilldown" : "040"
             },
             {
-               "y" : 74,
                "drilldown" : "041",
+               "y" : 74,
                "name" : "#041"
             },
             {