aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohammad S Anwar <mohammad.anwar@yahoo.com>2020-09-29 20:37:16 +0100
committerMohammad S Anwar <mohammad.anwar@yahoo.com>2020-09-29 20:37:16 +0100
commit880b1588590c9d82669fa11a95ee62179dc62d19 (patch)
tree92baf2aadc42b9a392556a1564c5d543fb6cc7d3
parent5c70bb780bd8e2ee107386c3c38d38a9b2ad362f (diff)
downloadperlweeklychallenge-club-880b1588590c9d82669fa11a95ee62179dc62d19.tar.gz
perlweeklychallenge-club-880b1588590c9d82669fa11a95ee62179dc62d19.tar.bz2
perlweeklychallenge-club-880b1588590c9d82669fa11a95ee62179dc62d19.zip
- Added solution by Vinod Kumar K.
-rw-r--r--stats/pwc-current.json273
-rw-r--r--stats/pwc-language-breakdown-summary.json70
-rw-r--r--stats/pwc-language-breakdown.json596
-rw-r--r--stats/pwc-leaders.json370
-rw-r--r--stats/pwc-summary-1-30.json46
-rw-r--r--stats/pwc-summary-121-150.json50
-rw-r--r--stats/pwc-summary-151-180.json30
-rw-r--r--stats/pwc-summary-181-210.json68
-rw-r--r--stats/pwc-summary-31-60.json100
-rw-r--r--stats/pwc-summary-61-90.json38
-rw-r--r--stats/pwc-summary-91-120.json106
-rw-r--r--stats/pwc-summary.json38
12 files changed, 900 insertions, 885 deletions
diff --git a/stats/pwc-current.json b/stats/pwc-current.json
index 41e92fa8c1..63c68e1ae5 100644
--- a/stats/pwc-current.json
+++ b/stats/pwc-current.json
@@ -1,9 +1,119 @@
{
+ "subtitle" : {
+ "text" : "[Champions: 14] Last updated at 2020-09-29 19:36:52 GMT"
+ },
+ "xAxis" : {
+ "type" : "category"
+ },
+ "yAxis" : {
+ "title" : {
+ "text" : "Total Solutions"
+ }
+ },
+ "title" : {
+ "text" : "Perl Weekly Challenge - 080"
+ },
+ "legend" : {
+ "enabled" : 0
+ },
+ "chart" : {
+ "type" : "column"
+ },
+ "tooltip" : {
+ "headerFormat" : "<span style='font-size:11px'>{series.name}</span><br/>",
+ "followPointer" : 1,
+ "pointFormat" : "<span style='color:{point.color}'>{point.name}</span>: <b>{point.y:f}</b><br/>"
+ },
+ "series" : [
+ {
+ "colorByPoint" : 1,
+ "data" : [
+ {
+ "name" : "Andinus",
+ "drilldown" : "Andinus",
+ "y" : 4
+ },
+ {
+ "y" : 2,
+ "drilldown" : "James Smith",
+ "name" : "James Smith"
+ },
+ {
+ "y" : 4,
+ "drilldown" : "Kang-min Liu",
+ "name" : "Kang-min Liu"
+ },
+ {
+ "drilldown" : "Lubos Kolouch",
+ "name" : "Lubos Kolouch",
+ "y" : 2
+ },
+ {
+ "y" : 2,
+ "name" : "Mark Anderson",
+ "drilldown" : "Mark Anderson"
+ },
+ {
+ "name" : "Markus Holzer",
+ "drilldown" : "Markus Holzer",
+ "y" : 2
+ },
+ {
+ "drilldown" : "Mohammad S Anwar",
+ "name" : "Mohammad S Anwar",
+ "y" : 4
+ },
+ {
+ "drilldown" : "Myoungjin Jeon",
+ "name" : "Myoungjin Jeon",
+ "y" : 1
+ },
+ {
+ "y" : 2,
+ "name" : "Niels van Dijke",
+ "drilldown" : "Niels van Dijke"
+ },
+ {
+ "name" : "Roger Bell_West",
+ "drilldown" : "Roger Bell_West",
+ "y" : 5
+ },
+ {
+ "y" : 2,
+ "name" : "Shawn Wagner",
+ "drilldown" : "Shawn Wagner"
+ },
+ {
+ "name" : "Simon Proctor",
+ "drilldown" : "Simon Proctor",
+ "y" : 2
+ },
+ {
+ "name" : "Vinod Kumar K",
+ "drilldown" : "Vinod Kumar K",
+ "y" : 1
+ },
+ {
+ "y" : 3,
+ "name" : "Walt Mankowski",
+ "drilldown" : "Walt Mankowski"
+ }
+ ],
+ "name" : "Perl Weekly Challenge - 080"
+ }
+ ],
+ "plotOptions" : {
+ "series" : {
+ "dataLabels" : {
+ "format" : "{point.y}",
+ "enabled" : 1
+ },
+ "borderWidth" : 0
+ }
+ },
"drilldown" : {
"series" : [
{
- "name" : "Andinus",
- "id" : "Andinus",
"data" : [
[
"Perl",
@@ -13,7 +123,9 @@
"Blog",
2
]
- ]
+ ],
+ "name" : "Andinus",
+ "id" : "Andinus"
},
{
"name" : "James Smith",
@@ -26,6 +138,8 @@
"id" : "James Smith"
},
{
+ "id" : "Kang-min Liu",
+ "name" : "Kang-min Liu",
"data" : [
[
"Perl",
@@ -35,19 +149,17 @@
"Raku",
2
]
- ],
- "id" : "Kang-min Liu",
- "name" : "Kang-min Liu"
+ ]
},
{
+ "id" : "Lubos Kolouch",
"name" : "Lubos Kolouch",
"data" : [
[
"Perl",
2
]
- ],
- "id" : "Lubos Kolouch"
+ ]
},
{
"name" : "Mark Anderson",
@@ -60,17 +172,16 @@
"id" : "Mark Anderson"
},
{
+ "id" : "Markus Holzer",
+ "name" : "Markus Holzer",
"data" : [
[
"Raku",
2
]
- ],
- "id" : "Markus Holzer",
- "name" : "Markus Holzer"
+ ]
},
{
- "name" : "Mohammad S Anwar",
"data" : [
[
"Perl",
@@ -81,29 +192,31 @@
2
]
],
+ "name" : "Mohammad S Anwar",
"id" : "Mohammad S Anwar"
},
{
+ "id" : "Myoungjin Jeon",
"name" : "Myoungjin Jeon",
"data" : [
[
"Blog",
1
]
- ],
- "id" : "Myoungjin Jeon"
+ ]
},
{
- "name" : "Niels van Dijke",
"id" : "Niels van Dijke",
"data" : [
[
"Perl",
2
]
- ]
+ ],
+ "name" : "Niels van Dijke"
},
{
+ "id" : "Roger Bell_West",
"name" : "Roger Bell_West",
"data" : [
[
@@ -118,18 +231,17 @@
"Blog",
1
]
- ],
- "id" : "Roger Bell_West"
+ ]
},
{
- "name" : "Shawn Wagner",
"id" : "Shawn Wagner",
"data" : [
[
"Perl",
2
]
- ]
+ ],
+ "name" : "Shawn Wagner"
},
{
"name" : "Simon Proctor",
@@ -142,7 +254,16 @@
"id" : "Simon Proctor"
},
{
- "name" : "Walt Mankowski",
+ "id" : "Vinod Kumar K",
+ "data" : [
+ [
+ "Perl",
+ 1
+ ]
+ ],
+ "name" : "Vinod Kumar K"
+ },
+ {
"id" : "Walt Mankowski",
"data" : [
[
@@ -153,115 +274,9 @@
"Blog",
1
]
- ]
+ ],
+ "name" : "Walt Mankowski"
}
]
- },
- "series" : [
- {
- "data" : [
- {
- "drilldown" : "Andinus",
- "name" : "Andinus",
- "y" : 4
- },
- {
- "drilldown" : "James Smith",
- "name" : "James Smith",
- "y" : 2
- },
- {
- "drilldown" : "Kang-min Liu",
- "y" : 4,
- "name" : "Kang-min Liu"
- },
- {
- "drilldown" : "Lubos Kolouch",
- "name" : "Lubos Kolouch",
- "y" : 2
- },
- {
- "drilldown" : "Mark Anderson",
- "name" : "Mark Anderson",
- "y" : 2
- },
- {
- "y" : 2,
- "name" : "Markus Holzer",
- "drilldown" : "Markus Holzer"
- },
- {
- "drilldown" : "Mohammad S Anwar",
- "name" : "Mohammad S Anwar",
- "y" : 4
- },
- {
- "y" : 1,
- "name" : "Myoungjin Jeon",
- "drilldown" : "Myoungjin Jeon"
- },
- {
- "name" : "Niels van Dijke",
- "y" : 2,
- "drilldown" : "Niels van Dijke"
- },
- {
- "y" : 5,
- "name" : "Roger Bell_West",
- "drilldown" : "Roger Bell_West"
- },
- {
- "name" : "Shawn Wagner",
- "y" : 2,
- "drilldown" : "Shawn Wagner"
- },
- {
- "y" : 2,
- "name" : "Simon Proctor",
- "drilldown" : "Simon Proctor"
- },
- {
- "name" : "Walt Mankowski",
- "y" : 3,
- "drilldown" : "Walt Mankowski"
- }
- ],
- "colorByPoint" : 1,
- "name" : "Perl Weekly Challenge - 080"
- }
- ],
- "title" : {
- "text" : "Perl Weekly Challenge - 080"
- },
- "xAxis" : {
- "type" : "category"
- },
- "chart" : {
- "type" : "column"
- },
- "subtitle" : {
- "text" : "[Champions: 13] Last updated at 2020-09-29 19:04:07 GMT"
- },
- "legend" : {
- "enabled" : 0
- },
- "plotOptions" : {
- "series" : {
- "borderWidth" : 0,
- "dataLabels" : {
- "format" : "{point.y}",
- "enabled" : 1
- }
- }
- },
- "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/>"
- },
- "yAxis" : {
- "title" : {
- "text" : "Total Solutions"
- }
}
}
diff --git a/stats/pwc-language-breakdown-summary.json b/stats/pwc-language-breakdown-summary.json
index 88670c073e..90960ce349 100644
--- a/stats/pwc-language-breakdown-summary.json
+++ b/stats/pwc-language-breakdown-summary.json
@@ -1,18 +1,38 @@
{
+ "title" : {
+ "text" : "Perl Weekly Challenge Contributions [2019 - 2020]"
+ },
+ "yAxis" : {
+ "min" : 0,
+ "title" : {
+ "text" : null
+ }
+ },
+ "xAxis" : {
+ "labels" : {
+ "style" : {
+ "fontSize" : "13px",
+ "fontFamily" : "Verdana, sans-serif"
+ }
+ },
+ "type" : "category"
+ },
+ "subtitle" : {
+ "text" : "Last updated at 2020-09-29 19:36:51 GMT"
+ },
"series" : [
{
- "name" : "Contributions",
"dataLabels" : {
- "align" : "right",
+ "y" : 10,
+ "format" : "{point.y:.0f}",
"style" : {
- "fontFamily" : "Verdana, sans-serif",
- "fontSize" : "13px"
+ "fontSize" : "13px",
+ "fontFamily" : "Verdana, sans-serif"
},
+ "align" : "right",
+ "rotation" : -90,
"enabled" : "true",
- "color" : "#FFFFFF",
- "format" : "{point.y:.0f}",
- "y" : 10,
- "rotation" : -90
+ "color" : "#FFFFFF"
},
"data" : [
[
@@ -21,43 +41,23 @@
],
[
"Perl",
- 3402
+ 3403
],
[
"Raku",
2202
]
- ]
+ ],
+ "name" : "Contributions"
}
],
- "title" : {
- "text" : "Perl Weekly Challenge Contributions [2019 - 2020]"
- },
- "xAxis" : {
- "labels" : {
- "style" : {
- "fontFamily" : "Verdana, sans-serif",
- "fontSize" : "13px"
- }
- },
- "type" : "category"
- },
- "chart" : {
- "type" : "column"
- },
- "subtitle" : {
- "text" : "Last updated at 2020-09-29 19:04:07 GMT"
+ "tooltip" : {
+ "pointFormat" : "<b>{point.y:.0f}</b>"
},
"legend" : {
"enabled" : "false"
},
- "yAxis" : {
- "title" : {
- "text" : null
- },
- "min" : 0
- },
- "tooltip" : {
- "pointFormat" : "<b>{point.y:.0f}</b>"
+ "chart" : {
+ "type" : "column"
}
}
diff --git a/stats/pwc-language-breakdown.json b/stats/pwc-language-breakdown.json
index 5b6bd35067..05dcb226b0 100644
--- a/stats/pwc-language-breakdown.json
+++ b/stats/pwc-language-breakdown.json
@@ -1,4 +1,24 @@
{
+ "tooltip" : {
+ "followPointer" : "true",
+ "pointFormat" : "<span style=\"color:{point.color}\">Challenge {point.name}</span>: <b>{point.y:f}</b><br/>",
+ "headerFormat" : "<span style=\"font-size:11px\"></span>"
+ },
+ "chart" : {
+ "type" : "column"
+ },
+ "legend" : {
+ "enabled" : "false"
+ },
+ "plotOptions" : {
+ "series" : {
+ "dataLabels" : {
+ "format" : "{point.y}",
+ "enabled" : 1
+ },
+ "borderWidth" : 0
+ }
+ },
"series" : [
{
"data" : [
@@ -8,24 +28,24 @@
"drilldown" : "001"
},
{
- "name" : "#002",
"y" : 111,
+ "name" : "#002",
"drilldown" : "002"
},
{
- "y" : 71,
"name" : "#003",
- "drilldown" : "003"
+ "drilldown" : "003",
+ "y" : 71
},
{
+ "y" : 91,
"drilldown" : "004",
- "name" : "#004",
- "y" : 91
+ "name" : "#004"
},
{
- "name" : "#005",
"y" : 72,
- "drilldown" : "005"
+ "drilldown" : "005",
+ "name" : "#005"
},
{
"y" : 52,
@@ -33,43 +53,43 @@
"drilldown" : "006"
},
{
+ "name" : "#007",
"drilldown" : "007",
- "y" : 59,
- "name" : "#007"
+ "y" : 59
},
{
- "y" : 72,
+ "drilldown" : "008",
"name" : "#008",
- "drilldown" : "008"
+ "y" : 72
},
{
"y" : 70,
- "name" : "#009",
- "drilldown" : "009"
+ "drilldown" : "009",
+ "name" : "#009"
},
{
+ "name" : "#010",
"drilldown" : "010",
- "y" : 60,
- "name" : "#010"
+ "y" : 60
},
{
- "y" : 79,
+ "drilldown" : "011",
"name" : "#011",
- "drilldown" : "011"
+ "y" : 79
},
{
- "name" : "#012",
"y" : 83,
+ "name" : "#012",
"drilldown" : "012"
},
{
- "y" : 78,
"name" : "#013",
- "drilldown" : "013"
+ "drilldown" : "013",
+ "y" : 78
},
{
- "drilldown" : "014",
"y" : 96,
+ "drilldown" : "014",
"name" : "#014"
},
{
@@ -78,59 +98,59 @@
"y" : 93
},
{
+ "name" : "#016",
"drilldown" : "016",
- "y" : 66,
- "name" : "#016"
+ "y" : 66
},
{
"name" : "#017",
- "y" : 79,
- "drilldown" : "017"
+ "drilldown" : "017",
+ "y" : 79
},
{
"y" : 76,
- "name" : "#018",
- "drilldown" : "018"
+ "drilldown" : "018",
+ "name" : "#018"
},
{
- "name" : "#019",
"y" : 97,
- "drilldown" : "019"
+ "drilldown" : "019",
+ "name" : "#019"
},
{
"name" : "#020",
- "y" : 95,
- "drilldown" : "020"
+ "drilldown" : "020",
+ "y" : 95
},
{
- "name" : "#021",
"y" : 67,
+ "name" : "#021",
"drilldown" : "021"
},
{
- "y" : 63,
+ "drilldown" : "022",
"name" : "#022",
- "drilldown" : "022"
+ "y" : 63
},
{
- "name" : "#023",
"y" : 91,
- "drilldown" : "023"
+ "drilldown" : "023",
+ "name" : "#023"
},
{
- "name" : "#024",
"y" : 70,
- "drilldown" : "024"
+ "drilldown" : "024",
+ "name" : "#024"
},
{
"drilldown" : "025",
- "y" : 55,
- "name" : "#025"
+ "name" : "#025",
+ "y" : 55
},
{
+ "drilldown" : "026",
"name" : "#026",
- "y" : 70,
- "drilldown" : "026"
+ "y" : 70
},
{
"drilldown" : "027",
@@ -138,64 +158,64 @@
"y" : 58
},
{
+ "y" : 78,
"drilldown" : "028",
- "name" : "#028",
- "y" : 78
+ "name" : "#028"
},
{
"name" : "#029",
- "y" : 77,
- "drilldown" : "029"
+ "drilldown" : "029",
+ "y" : 77
},
{
- "name" : "#030",
"y" : 115,
+ "name" : "#030",
"drilldown" : "030"
},
{
- "y" : 87,
"name" : "#031",
- "drilldown" : "031"
+ "drilldown" : "031",
+ "y" : 87
},
{
"name" : "#032",
- "y" : 92,
- "drilldown" : "032"
+ "drilldown" : "032",
+ "y" : 92
},
{
- "drilldown" : "033",
"y" : 108,
+ "drilldown" : "033",
"name" : "#033"
},
{
- "y" : 62,
+ "drilldown" : "034",
"name" : "#034",
- "drilldown" : "034"
+ "y" : 62
},
{
- "drilldown" : "035",
"name" : "#035",
+ "drilldown" : "035",
"y" : 62
},
{
- "name" : "#036",
"y" : 66,
+ "name" : "#036",
"drilldown" : "036"
},
{
"drilldown" : "037",
- "y" : 65,
- "name" : "#037"
+ "name" : "#037",
+ "y" : 65
},
{
"drilldown" : "038",
- "y" : 65,
- "name" : "#038"
+ "name" : "#038",
+ "y" : 65
},
{
+ "y" : 60,
"drilldown" : "039",
- "name" : "#039",
- "y" : 60
+ "name" : "#039"
},
{
"y" : 71,
@@ -204,18 +224,18 @@
},
{
"name" : "#041",
- "y" : 74,
- "drilldown" : "041"
+ "drilldown" : "041",
+ "y" : 74
},
{
- "drilldown" : "042",
+ "y" : 88,
"name" : "#042",
- "y" : 88
+ "drilldown" : "042"
},
{
- "y" : 66,
"name" : "#043",
- "drilldown" : "043"
+ "drilldown" : "043",
+ "y" : 66
},
{
"drilldown" : "044",
@@ -223,8 +243,8 @@
"y" : 82
},
{
- "name" : "#045",
"y" : 94,
+ "name" : "#045",
"drilldown" : "045"
},
{
@@ -233,29 +253,29 @@
"drilldown" : "046"
},
{
+ "name" : "#047",
"drilldown" : "047",
- "y" : 82,
- "name" : "#047"
+ "y" : 82
},
{
+ "name" : "#048",
"drilldown" : "048",
- "y" : 106,
- "name" : "#048"
+ "y" : 106
},
{
+ "name" : "#049",
"drilldown" : "049",
- "y" : 85,
- "name" : "#049"
+ "y" : 85
},
{
- "drilldown" : "050",
"y" : 96,
- "name" : "#050"
+ "name" : "#050",
+ "drilldown" : "050"
},
{
"y" : 87,
- "name" : "#051",
- "drilldown" : "051"
+ "drilldown" : "051",
+ "name" : "#051"
},
{
"drilldown" : "052",
@@ -263,29 +283,29 @@
"y" : 89
},
{
- "drilldown" : "053",
"y" : 99,
+ "drilldown" : "053",
"name" : "#053"
},
{
+ "name" : "#054",
"drilldown" : "054",
- "y" : 101,
- "name" : "#054"
+ "y" : 101
},
{
- "y" : 86,
+ "drilldown" : "055",
"name" : "#055",
- "drilldown" : "055"
+ "y" : 86
},
{
"name" : "#056",
- "y" : 93,
- "drilldown" : "056"
+ "drilldown" : "056",
+ "y" : 93
},
{
"y" : 78,
- "name" : "#057",
- "drilldown" : "057"
+ "drilldown" : "057",
+ "name" : "#057"
},
{
"y" : 67,
@@ -294,28 +314,28 @@
},
{
"name" : "#059",
- "y" : 87,
- "drilldown" : "059"
+ "drilldown" : "059",
+ "y" : 87
},
{
"y" : 83,
- "name" : "#060",
- "drilldown" : "060"
+ "drilldown" : "060",
+ "name" : "#060"
},
{
- "drilldown" : "061",
"y" : 79,
+ "drilldown" : "061",
"name" : "#061"
},
{
- "drilldown" : "062",
+ "y" : 54,
"name" : "#062",
- "y" : 54
+ "drilldown" : "062"
},
{
"y" : 87,
- "name" : "#063",
- "drilldown" : "063"
+ "drilldown" : "063",
+ "name" : "#063"
},
{
"drilldown" : "064",
@@ -323,24 +343,24 @@
"y" : 78
},
{
+ "name" : "#065",
"drilldown" : "065",
- "y" : 71,
- "name" : "#065"
+ "y" : 71
},
{
- "name" : "#066",
"y" : 82,
+ "name" : "#066",
"drilldown" : "066"
},
{
- "y" : 88,
"name" : "#067",
- "drilldown" : "067"
+ "drilldown" : "067",
+ "y" : 88
},
{
+ "y" : 73,
"drilldown" : "068",
- "name" : "#068",
- "y" : 73
+ "name" : "#068"
},
{
"drilldown" : "069",
@@ -348,9 +368,9 @@
"y" : 81
},
{
+ "name" : "#070",
"drilldown" : "070",
- "y" : 91,
- "name" : "#070"
+ "y" : 91
},
{
"y" : 76,
@@ -358,66 +378,58 @@
"drilldown" : "071"
},
{
- "drilldown" : "072",
"y" : 110,
+ "drilldown" : "072",
"name" : "#072"
},
{
- "drilldown" : "073",
"y" : 108,
+ "drilldown" : "073",
"name" : "#073"
},
{
+ "name" : "#074",
"drilldown" : "074",
- "y" : 113,
- "name" : "#074"
+ "y" : 113
},
{
- "y" : 111,
+ "drilldown" : "075",
"name" : "#075",
- "drilldown" : "075"
+ "y" : 111
},
{
- "drilldown" : "076",
+ "y" : 91,
"name" : "#076",
- "y" : 91
+ "drilldown" : "076"
},
{
- "drilldown" : "077",
"y" : 94,
- "name" : "#077"
+ "name" : "#077",
+ "drilldown" : "077"
},
{
- "y" : 121,
+ "drilldown" : "078",
"name" : "#078",
- "drilldown" : "078"
+ "y" : 121
},
{
+ "drilldown" : "079",
"name" : "#079",
- "y" : 114,
- "drilldown" : "079"
+ "y" : 114
},
{
+ "name" : "#080",
"drilldown" : "080",
- "y" : 35,
- "name" : "#080"
+ "y" : 36
}
],
- "colorByPoint" : "true",
- "name" : "Perl Weekly Challenge Languages"
+ "name" : "Perl Weekly Challenge Languages",
+ "colorByPoint" : "true"
}
],
- "xAxis" : {
- "type" : "category"
- },
- "title" : {
- "text" : "Perl Weekly Challenge Language"
- },
"drilldown" : {
"series" : [
{
- "name" : "001",
- "id" : "001",
"data" : [
[
"Perl",
@@ -431,9 +443,12 @@
"Blog",
11
]
- ]
+ ],
+ "name" : "001",
+ "id" : "001"
},
{
+ "id" : "002",
"name" : "002",
"data" : [
[
@@ -448,12 +463,10 @@
"Blog",
10
]
- ],
- "id" : "002"
+ ]
},
{
"name" : "003",
- "id" : "003",
"data" : [
[
"Perl",
@@ -467,10 +480,11 @@
"Blog",
9
]
- ]
+ ],
+ "id" : "003"
},
{
- "name" : "004",
+ "id" : "004",
"data" : [
[
"Perl",
@@ -485,10 +499,9 @@
10
]
],
- "id" : "004"
+ "name" : "004"
},
{
- "id" : "005",
"data" : [
[
"Perl",
@@ -503,7 +516,8 @@
12
]
],
- "name" : "005"
+ "name" : "005",
+ "id" : "005"
},
{
"data" : [
@@ -520,8 +534,8 @@