diff --git a/java/com.sap.sailing.domain.test/resources/event_20131112_ESSFlorian-Race_1.mtb b/java/com.sap.sailing.domain.test/resources/event_20131112_ESSFlorian-Race_1.mtb
index 9d3d17a14c0..c3295a2bde8 100755
Binary files a/java/com.sap.sailing.domain.test/resources/event_20131112_ESSFlorian-Race_1.mtb and b/java/com.sap.sailing.domain.test/resources/event_20131112_ESSFlorian-Race_1.mtb differ
diff --git a/java/com.sap.sailing.domain.test/resources/event_20131112_ESSFlorian-Race_1.txt b/java/com.sap.sailing.domain.test/resources/event_20131112_ESSFlorian-Race_1.txt
index bbca5d2ea68..57766045ccc 100755
--- a/java/com.sap.sailing.domain.test/resources/event_20131112_ESSFlorian-Race_1.txt
+++ b/java/com.sap.sailing.domain.test/resources/event_20131112_ESSFlorian-Race_1.txt
@@ -53,7 +53,7 @@ PrecisionMeters:20
 ShortAvgTime:180
 LongAvgTime:900
 TimeZone:
-CompMarkerTimeout:4
+CompMarkerTimeout:5
 FramesPerSecond:8
 replayspeedup:5
 MatchRaceClock:0
@@ -82,8 +82,8 @@ DisableChangeRace:0
 DisableLeaderboard:0
 DisableAnalysis:0
 TableFontSize:11
-//live-uri:tcp://192.168.1.203:4400
-//stored-uri:tcp://192.168.1.203:4401
+//live-uri:tcp://traclive.dk:5500
+//stored-uri:tcp://traclive.dk:5501
 compInitialsFontSize:11
 AutoRotate:1
 MassStart:0
@@ -92,7 +92,7 @@ StartType:Mass
 ReCalcDirAndSpeed:0
 RaceHandicapSystem:NONE
 TeamCompetitionType:NONE
-LiveDelaySecs: 4
+LiveDelaySecs: 10
 
 //-------- AUTO GENERATED PARAMETERS START ----------------
 
@@ -101,6 +101,7 @@ EventName:ESS Florianopolis 2013
 EventDB:event_20131112_ESSFlorian
 EventStartTime:2013-11-12 00:00:00
 EventEndTime:2013-11-18 00:00:00
+EventType:a1b74ca0-fdd8-11dc-8811-005056c00008
 
 RaceID:bca3b490-2dce-0131-27f0-60a44ce903c3
 RaceName:Race 1
@@ -287,275 +288,299 @@ Comp8StartTime:2013-11-14 16:15:00
 Comp8ClassUUID:648ee25a-83db-11e2-88c0-10bf48d758ce
 Comp8RouteUUID:71e6cc30-2dce-0131-27ea-60a44ce903c3
 
-ControlPoint1UUID:1286f15e-83be-11e2-88c0-10bf48d758ce
-ControlPoint1Name:Orange
-ControlPoint1HasTwoPoints:0
-ControlPoint1ShortName:O
-ControlPoint1DataSheet:Type=Buoy###BREAKLINE###Color=Orange###BREAKLINE###Shape=Conical###BREAKLINE###Name=Orange
-ControlPoint1Mark1Lon:-48.561082
-ControlPoint1Mark1Lat:-27.585780
+ControlPoint1UUID:0f82e950-3046-0131-cf67-10b11c4ed8fd
+ControlPoint1Name:RC-Green
+ControlPoint1HasTwoPoints:1
+ControlPoint1ShortName:S
+ControlPoint1DataSheet:P1.Type=StartBoat###BREAKLINE###P1.Name=Race Committee###BREAKLINE###P1.UUID=3e6c1c94-83bf-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Green###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Green###BREAKLINE###P2.UUID=785c3e44-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint1Mark1Lon:-48.559788
+ControlPoint1Mark1Lat:-27.584880
+ControlPoint1Mark2Lon:-48.563377
+ControlPoint1Mark2Lat:-27.584063
 
-ControlPoint2UUID:133d41f0-2dca-0131-279a-60a44ce903c3
-ControlPoint2Name:RC-Black Conical
-ControlPoint2HasTwoPoints:1
-ControlPoint2ShortName:S
-ControlPoint2DataSheet:P1.Type=StartBoat###BREAKLINE###P1.Name=Race Committee###BREAKLINE###P1.UUID=3e6c1c94-83bf-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Black###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Pattern=Checkered###BREAKLINE###P2.Name=Black Conical###BREAKLINE###P2.UUID=d78695ea-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint2Mark1Lon:-48.559360
-ControlPoint2Mark1Lat:-27.584543
-ControlPoint2Mark2Lon:-48.561523
-ControlPoint2Mark2Lat:-27.584017
+ControlPoint2UUID:1286f15e-83be-11e2-88c0-10bf48d758ce
+ControlPoint2Name:Orange
+ControlPoint2HasTwoPoints:0
+ControlPoint2ShortName:O
+ControlPoint2DataSheet:Type=Buoy###BREAKLINE###Color=Orange###BREAKLINE###Shape=Conical###BREAKLINE###Name=Orange
+ControlPoint2Mark1Lon:-48.562633
+ControlPoint2Mark1Lat:-27.586080
 
-ControlPoint3UUID:1c17f4d0-2dc9-0131-274a-60a44ce903c3
-ControlPoint3Name:Black Conical-WhiteP
+ControlPoint3UUID:133d41f0-2dca-0131-279a-60a44ce903c3
+ControlPoint3Name:RC-Black Conical
 ControlPoint3HasTwoPoints:1
 ControlPoint3ShortName:S
-ControlPoint3DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Black###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Pattern=Checkered###BREAKLINE###P1.Name=Black Conical###BREAKLINE###P1.UUID=d78695ea-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=White###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=White P###BREAKLINE###P2.UUID=e9ec42f8-83bd-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint3Mark1Lon:-48.561523
-ControlPoint3Mark1Lat:-27.584017
-ControlPoint3Mark2Lon:-48.560910
-ControlPoint3Mark2Lat:-27.585353
+ControlPoint3DataSheet:P1.Type=StartBoat###BREAKLINE###P1.Name=Race Committee###BREAKLINE###P1.UUID=3e6c1c94-83bf-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Black###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Pattern=Checkered###BREAKLINE###P2.Name=Black Conical###BREAKLINE###P2.UUID=d78695ea-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint3Mark1Lon:-48.559395
+ControlPoint3Mark1Lat:-27.584552
+ControlPoint3Mark2Lon:-48.561523
+ControlPoint3Mark2Lat:-27.584002
 
-ControlPoint4UUID:2b184930-2dca-0131-27a4-60a44ce903c3
-ControlPoint4Name:RC-Black Cylinder
+ControlPoint4UUID:1c17f4d0-2dc9-0131-274a-60a44ce903c3
+ControlPoint4Name:Black Conical-WhiteP
 ControlPoint4HasTwoPoints:1
-ControlPoint4ShortName:F
-ControlPoint4DataSheet:P1.Type=StartBoat###BREAKLINE###P1.Name=Race Committee###BREAKLINE###P1.UUID=3e6c1c94-83bf-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Black###BREAKLINE###P2.Shape=Cylinder###BREAKLINE###P2.Pattern=Checkered###BREAKLINE###P2.Name=Black Cylinder###BREAKLINE###P2.UUID=b153dfd6-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint4Mark1Lon:-48.559360
-ControlPoint4Mark1Lat:-27.584543
-ControlPoint4Mark2Lon:-48.561470
-ControlPoint4Mark2Lat:-27.585952
+ControlPoint4ShortName:S
+ControlPoint4DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Black###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Pattern=Checkered###BREAKLINE###P1.Name=Black Conical###BREAKLINE###P1.UUID=d78695ea-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=White###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=White P###BREAKLINE###P2.UUID=e9ec42f8-83bd-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint4Mark1Lon:-48.561523
+ControlPoint4Mark1Lat:-27.584002
+ControlPoint4Mark2Lon:-48.562482
+ControlPoint4Mark2Lat:-27.585808
 
-ControlPoint5UUID:2c46b4a0-2dc9-0131-2754-60a44ce903c3
-ControlPoint5Name:Black Conical-WhiteS
+ControlPoint5UUID:2b184930-2dca-0131-27a4-60a44ce903c3
+ControlPoint5Name:RC-Black Cylinder
 ControlPoint5HasTwoPoints:1
-ControlPoint5ShortName:S
-ControlPoint5DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Black###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Pattern=Checkered###BREAKLINE###P1.Name=Black Conical###BREAKLINE###P1.UUID=d78695ea-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=White###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=White S###BREAKLINE###P2.UUID=bf6777e6-83bd-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint5Mark1Lon:-48.561523
-ControlPoint5Mark1Lat:-27.584017
-ControlPoint5Mark2Lon:-48.561337
-ControlPoint5Mark2Lat:-27.585883
+ControlPoint5ShortName:F
+ControlPoint5DataSheet:P1.Type=StartBoat###BREAKLINE###P1.Name=Race Committee###BREAKLINE###P1.UUID=3e6c1c94-83bf-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Black###BREAKLINE###P2.Shape=Cylinder###BREAKLINE###P2.Pattern=Checkered###BREAKLINE###P2.Name=Black Cylinder###BREAKLINE###P2.UUID=b153dfd6-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint5Mark1Lon:-48.559395
+ControlPoint5Mark1Lat:-27.584552
+ControlPoint5Mark2Lon:-48.562600
+ControlPoint5Mark2Lat:-27.585920
 
-ControlPoint6UUID:3240586c-83c0-11e2-88c0-10bf48d758ce
-ControlPoint6Name:Finish Pole
-ControlPoint6HasTwoPoints:0
-ControlPoint6ShortName:F
-ControlPoint6DataSheet:Color=Black###BREAKLINE###Type=Landmark###BREAKLINE###Name=Finish Pole
-ControlPoint6Mark1Lon:-48.557442
-ControlPoint6Mark1Lat:-27.587342
+ControlPoint6UUID:2c46b4a0-2dc9-0131-2754-60a44ce903c3
+ControlPoint6Name:Black Conical-WhiteS
+ControlPoint6HasTwoPoints:1
+ControlPoint6ShortName:S
+ControlPoint6DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Black###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Pattern=Checkered###BREAKLINE###P1.Name=Black Conical###BREAKLINE###P1.UUID=d78695ea-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=White###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=White S###BREAKLINE###P2.UUID=bf6777e6-83bd-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint6Mark1Lon:-48.561523
+ControlPoint6Mark1Lat:-27.584002
+ControlPoint6Mark2Lon:-48.562603
+ControlPoint6Mark2Lat:-27.585983
 
-ControlPoint7UUID:32e7cd80-2f60-0131-ce8e-10b11c4ed8fd
-ControlPoint7Name:Black Conical - Orange
-ControlPoint7HasTwoPoints:1
-ControlPoint7ShortName:BO
-ControlPoint7DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Black###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Pattern=Checkered###BREAKLINE###P1.Name=Black Conical###BREAKLINE###P1.UUID=d78695ea-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Orange###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Orange###BREAKLINE###P2.UUID=1286f15e-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint7Mark1Lon:-48.557167
-ControlPoint7Mark1Lat:-27.587635
-ControlPoint7Mark2Lon:-48.557228
-ControlPoint7Mark2Lat:-27.587597
+ControlPoint7UUID:3240586c-83c0-11e2-88c0-10bf48d758ce
+ControlPoint7Name:Finish Pole
+ControlPoint7HasTwoPoints:0
+ControlPoint7ShortName:F
+ControlPoint7DataSheet:Color=Black###BREAKLINE###Type=Landmark###BREAKLINE###Name=Finish Pole
+ControlPoint7Mark1Lon:-48.557442
+ControlPoint7Mark1Lat:-27.587342
 
-ControlPoint8UUID:3e6c1c94-83bf-11e2-88c0-10bf48d758ce
-ControlPoint8Name:Race Committee
-ControlPoint8HasTwoPoints:0
-ControlPoint8ShortName:RC
-ControlPoint8DataSheet:Type=StartBoat###BREAKLINE###Name=Race Committee
-ControlPoint8Mark1Lon:-48.559360
-ControlPoint8Mark1Lat:-27.584543
+ControlPoint8UUID:32e7cd80-2f60-0131-ce8e-10b11c4ed8fd
+ControlPoint8Name:Black Conical - Orange
+ControlPoint8HasTwoPoints:1
+ControlPoint8ShortName:BO
+ControlPoint8DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Black###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Pattern=Checkered###BREAKLINE###P1.Name=Black Conical###BREAKLINE###P1.UUID=d78695ea-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Orange###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Orange###BREAKLINE###P2.UUID=1286f15e-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint8Mark1Lon:-48.557167
+ControlPoint8Mark1Lat:-27.587635
+ControlPoint8Mark2Lon:-48.557228
+ControlPoint8Mark2Lat:-27.587597
 
-ControlPoint9UUID:3fdd2402-83be-11e2-88c0-10bf48d758ce
-ControlPoint9Name:Yellow
+ControlPoint9UUID:38e5ec90-30f1-0131-d0ad-10b11c4ed8fd
+ControlPoint9Name:R9 Yellow
 ControlPoint9HasTwoPoints:0
 ControlPoint9ShortName:Y
-ControlPoint9DataSheet:Type=Buoy###BREAKLINE###Color=Yellow###BREAKLINE###Shape=Conical###BREAKLINE###Name=Yellow
-ControlPoint9Mark1Lon:-48.558777
-ControlPoint9Mark1Lat:-27.575673
+ControlPoint9Mark1Lon:-48.556918
+ControlPoint9Mark1Lat:-27.574885
 
-ControlPoint10UUID:4bea7160-2dc9-0131-275e-60a44ce903c3
-ControlPoint10Name:Black Conical-Yellow
-ControlPoint10HasTwoPoints:1
-ControlPoint10ShortName:S
-ControlPoint10DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Black###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Pattern=Checkered###BREAKLINE###P1.Name=Black Conical###BREAKLINE###P1.UUID=d78695ea-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Yellow###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Yellow###BREAKLINE###P2.UUID=3fdd2402-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint10Mark1Lon:-48.561523
-ControlPoint10Mark1Lat:-27.584017
-ControlPoint10Mark2Lon:-48.558777
-ControlPoint10Mark2Lat:-27.575673
+ControlPoint10UUID:3e6c1c94-83bf-11e2-88c0-10bf48d758ce
+ControlPoint10Name:Race Committee
+ControlPoint10HasTwoPoints:0
+ControlPoint10ShortName:RC
+ControlPoint10DataSheet:Type=StartBoat###BREAKLINE###Name=Race Committee
+ControlPoint10Mark1Lon:-48.559395
+ControlPoint10Mark1Lat:-27.584552
 
-ControlPoint11UUID:4f74d870-2dca-0131-27ae-60a44ce903c3
-ControlPoint11Name:Red-Green
-ControlPoint11HasTwoPoints:1
-ControlPoint11ShortName:RG
-ControlPoint11DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Red###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=Red###BREAKLINE###P1.UUID=5427c7d2-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Green###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Green###BREAKLINE###P2.UUID=785c3e44-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint11Mark1Lon:-48.559833
-ControlPoint11Mark1Lat:-27.575753
-ControlPoint11Mark2Lon:-48.562709999999996
-ControlPoint11Mark2Lat:-27.586253
+ControlPoint11UUID:3fdd2402-83be-11e2-88c0-10bf48d758ce
+ControlPoint11Name:Yellow
+ControlPoint11HasTwoPoints:0
+ControlPoint11ShortName:Y
+ControlPoint11DataSheet:Type=Buoy###BREAKLINE###Color=Yellow###BREAKLINE###Shape=Conical###BREAKLINE###Name=Yellow
+ControlPoint11Mark1Lon:-48.558770
+ControlPoint11Mark1Lat:-27.575680
 
-ControlPoint12UUID:5427c7d2-83be-11e2-88c0-10bf48d758ce
-ControlPoint12Name:Red
-ControlPoint12HasTwoPoints:0
-ControlPoint12ShortName:R
-ControlPoint12DataSheet:Type=Buoy###BREAKLINE###Color=Red###BREAKLINE###Shape=Conical###BREAKLINE###Name=Red
-ControlPoint12Mark1Lon:-48.559833
-ControlPoint12Mark1Lat:-27.575753
+ControlPoint12UUID:4bea7160-2dc9-0131-275e-60a44ce903c3
+ControlPoint12Name:Black Conical-Yellow
+ControlPoint12HasTwoPoints:1
+ControlPoint12ShortName:S
+ControlPoint12DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Black###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Pattern=Checkered###BREAKLINE###P1.Name=Black Conical###BREAKLINE###P1.UUID=d78695ea-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Yellow###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Yellow###BREAKLINE###P2.UUID=3fdd2402-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint12Mark1Lon:-48.561523
+ControlPoint12Mark1Lat:-27.584002
+ControlPoint12Mark2Lon:-48.558770
+ControlPoint12Mark2Lat:-27.575680
 
-ControlPoint13UUID:60e54960-2dc8-0131-2722-60a44ce903c3
-ControlPoint13Name:Black Gate
+ControlPoint13UUID:4f74d870-2dca-0131-27ae-60a44ce903c3
+ControlPoint13Name:Red-Green
 ControlPoint13HasTwoPoints:1
-ControlPoint13ShortName:B
-ControlPoint13DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Black###BREAKLINE###P1.Shape=Cylinder###BREAKLINE###P1.Pattern=Checkered###BREAKLINE###P1.Name=Black Cylinder###BREAKLINE###P1.UUID=b153dfd6-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Black###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Pattern=Checkered###BREAKLINE###P2.Name=Black Conical###BREAKLINE###P2.UUID=d78695ea-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint13Mark1Lon:-48.561470
-ControlPoint13Mark1Lat:-27.585952
-ControlPoint13Mark2Lon:-48.561523
-ControlPoint13Mark2Lat:-27.584017
+ControlPoint13ShortName:RG
+ControlPoint13DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Red###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=Red###BREAKLINE###P1.UUID=5427c7d2-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Green###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Green###BREAKLINE###P2.UUID=785c3e44-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint13Mark1Lon:-48.559833
+ControlPoint13Mark1Lat:-27.575753
+ControlPoint13Mark2Lon:-48.562470
+ControlPoint13Mark2Lat:-27.585780
 
-ControlPoint14UUID:648db960-2dca-0131-27b8-60a44ce903c3
-ControlPoint14Name:Red-Orange
-ControlPoint14HasTwoPoints:1
-ControlPoint14ShortName:RO
-ControlPoint14DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Red###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=Red###BREAKLINE###P1.UUID=5427c7d2-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Orange###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Orange###BREAKLINE###P2.UUID=1286f15e-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint14Mark1Lon:-48.559833
-ControlPoint14Mark1Lat:-27.575753
-ControlPoint14Mark2Lon:-48.561082
-ControlPoint14Mark2Lat:-27.585780
+ControlPoint14UUID:538c48e0-31fd-0131-cc02-10bf48d758ce
+ControlPoint14Name:R20-Green
+ControlPoint14HasTwoPoints:0
+ControlPoint14ShortName:G
+ControlPoint14Mark1Lon:-48.560232
+ControlPoint14Mark1Lat:-27.580741
 
-ControlPoint15UUID:72216ea0-2dca-0131-27c2-60a44ce903c3
-ControlPoint15Name:Red-Yellow
-ControlPoint15HasTwoPoints:1
-ControlPoint15ShortName:RY
-ControlPoint15DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Red###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=Red###BREAKLINE###P1.UUID=5427c7d2-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Yellow###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Yellow###BREAKLINE###P2.UUID=3fdd2402-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint15UUID:5427c7d2-83be-11e2-88c0-10bf48d758ce
+ControlPoint15Name:Red
+ControlPoint15HasTwoPoints:0
+ControlPoint15ShortName:R
+ControlPoint15DataSheet:Type=Buoy###BREAKLINE###Color=Red###BREAKLINE###Shape=Conical###BREAKLINE###Name=Red
 ControlPoint15Mark1Lon:-48.559833
 ControlPoint15Mark1Lat:-27.575753
-ControlPoint15Mark2Lon:-48.558777
-ControlPoint15Mark2Lat:-27.575673
 
-ControlPoint16UUID:785c3e44-83be-11e2-88c0-10bf48d758ce
-ControlPoint16Name:Green
-ControlPoint16HasTwoPoints:0
-ControlPoint16ShortName:G
-ControlPoint16DataSheet:Type=Buoy###BREAKLINE###Color=Green###BREAKLINE###Shape=Conical###BREAKLINE###Name=Green
-ControlPoint16Mark1Lon:-48.562709999999996
-ControlPoint16Mark1Lat:-27.586253
+ControlPoint16UUID:60e54960-2dc8-0131-2722-60a44ce903c3
+ControlPoint16Name:Black Gate
+ControlPoint16HasTwoPoints:1
+ControlPoint16ShortName:B
+ControlPoint16DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Black###BREAKLINE###P1.Shape=Cylinder###BREAKLINE###P1.Pattern=Checkered###BREAKLINE###P1.Name=Black Cylinder###BREAKLINE###P1.UUID=b153dfd6-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Black###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Pattern=Checkered###BREAKLINE###P2.Name=Black Conical###BREAKLINE###P2.UUID=d78695ea-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint16Mark1Lon:-48.562600
+ControlPoint16Mark1Lat:-27.585920
+ControlPoint16Mark2Lon:-48.561523
+ControlPoint16Mark2Lat:-27.584002
 
-ControlPoint17UUID:7c057f10-2dc9-0131-2768-60a44ce903c3
-ControlPoint17Name:Green-Orange
+ControlPoint17UUID:648db960-2dca-0131-27b8-60a44ce903c3
+ControlPoint17Name:Red-Orange
 ControlPoint17HasTwoPoints:1
-ControlPoint17ShortName:GO
-ControlPoint17DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Green###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=Green###BREAKLINE###P1.UUID=785c3e44-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Orange###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Orange###BREAKLINE###P2.UUID=1286f15e-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint17Mark1Lon:-48.562709999999996
-ControlPoint17Mark1Lat:-27.586253
-ControlPoint17Mark2Lon:-48.561082
-ControlPoint17Mark2Lat:-27.585780
+ControlPoint17ShortName:RO
+ControlPoint17DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Red###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=Red###BREAKLINE###P1.UUID=5427c7d2-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Orange###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Orange###BREAKLINE###P2.UUID=1286f15e-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint17Mark1Lon:-48.559833
+ControlPoint17Mark1Lat:-27.575753
+ControlPoint17Mark2Lon:-48.562633
+ControlPoint17Mark2Lat:-27.586080
 
-ControlPoint18UUID:914f22b0-2dca-0131-27cc-60a44ce903c3
-ControlPoint18Name:White Gate
+ControlPoint18UUID:72216ea0-2dca-0131-27c2-60a44ce903c3
+ControlPoint18Name:Red-Yellow
 ControlPoint18HasTwoPoints:1
-ControlPoint18ShortName:W
-ControlPoint18DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=White###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=White S###BREAKLINE###P1.UUID=bf6777e6-83bd-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=White###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=White P###BREAKLINE###P2.UUID=e9ec42f8-83bd-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint18Mark1Lon:-48.561337
-ControlPoint18Mark1Lat:-27.585883
-ControlPoint18Mark2Lon:-48.560910
-ControlPoint18Mark2Lat:-27.585353
+ControlPoint18ShortName:RY
+ControlPoint18DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Red###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=Red###BREAKLINE###P1.UUID=5427c7d2-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Yellow###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Yellow###BREAKLINE###P2.UUID=3fdd2402-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint18Mark1Lon:-48.559833
+ControlPoint18Mark1Lat:-27.575753
+ControlPoint18Mark2Lon:-48.558770
+ControlPoint18Mark2Lat:-27.575680
 
-ControlPoint19UUID:aa831320-2dc8-0131-272c-60a44ce903c3
-ControlPoint19Name:Finish Pole-Cylinder
-ControlPoint19HasTwoPoints:1
-ControlPoint19ShortName:F
-ControlPoint19DataSheet:P1.Color=Black###BREAKLINE###P1.Type=Landmark###BREAKLINE###P1.Name=Finish Pole###BREAKLINE###P1.UUID=3240586c-83c0-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Black###BREAKLINE###P2.Shape=Cylinder###BREAKLINE###P2.Pattern=Checkered###BREAKLINE###P2.Name=Black Cylinder###BREAKLINE###P2.UUID=b153dfd6-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint19Mark1Lon:-48.557442
-ControlPoint19Mark1Lat:-27.587342
-ControlPoint19Mark2Lon:-48.561470
-ControlPoint19Mark2Lat:-27.585952
+ControlPoint19UUID:785c3e44-83be-11e2-88c0-10bf48d758ce
+ControlPoint19Name:Green
+ControlPoint19HasTwoPoints:0
+ControlPoint19ShortName:G
+ControlPoint19DataSheet:Type=Buoy###BREAKLINE###Color=Green###BREAKLINE###Shape=Conical###BREAKLINE###Name=Green
+ControlPoint19Mark1Lon:-48.562470
+ControlPoint19Mark1Lat:-27.585780
 
-ControlPoint20UUID:af4e4920-2dc9-0131-2772-60a44ce903c3
-ControlPoint20Name:Green-WhiteP
+ControlPoint20UUID:7c057f10-2dc9-0131-2768-60a44ce903c3
+ControlPoint20Name:Green-Orange
 ControlPoint20HasTwoPoints:1
-ControlPoint20ShortName:GP
-ControlPoint20DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Green###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=Green###BREAKLINE###P1.UUID=785c3e44-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=White###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=White P###BREAKLINE###P2.UUID=e9ec42f8-83bd-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint20Mark1Lon:-48.562709999999996
-ControlPoint20Mark1Lat:-27.586253
-ControlPoint20Mark2Lon:-48.560910
-ControlPoint20Mark2Lat:-27.585353
+ControlPoint20ShortName:GO
+ControlPoint20DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Green###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=Green###BREAKLINE###P1.UUID=785c3e44-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Orange###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Orange###BREAKLINE###P2.UUID=1286f15e-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint20Mark1Lon:-48.562470
+ControlPoint20Mark1Lat:-27.585780
+ControlPoint20Mark2Lon:-48.562633
+ControlPoint20Mark2Lat:-27.586080
 
-ControlPoint21UUID:b153dfd6-83be-11e2-88c0-10bf48d758ce
-ControlPoint21Name:Black Cylinder
-ControlPoint21HasTwoPoints:0
-ControlPoint21ShortName:B
-ControlPoint21DataSheet:Type=Buoy###BREAKLINE###Color=Black###BREAKLINE###Shape=Cylinder###BREAKLINE###Pattern=Checkered###BREAKLINE###Name=Black Cylinder
-ControlPoint21Mark1Lon:-48.561470
-ControlPoint21Mark1Lat:-27.585952
+ControlPoint21UUID:914f22b0-2dca-0131-27cc-60a44ce903c3
+ControlPoint21Name:White Gate
+ControlPoint21HasTwoPoints:1
+ControlPoint21ShortName:W
+ControlPoint21DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=White###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=White S###BREAKLINE###P1.UUID=bf6777e6-83bd-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=White###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=White P###BREAKLINE###P2.UUID=e9ec42f8-83bd-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint21Mark1Lon:-48.562603
+ControlPoint21Mark1Lat:-27.585983
+ControlPoint21Mark2Lon:-48.562482
+ControlPoint21Mark2Lat:-27.585808
 
-ControlPoint22UUID:bf6777e6-83bd-11e2-88c0-10bf48d758ce
-ControlPoint22Name:White S
-ControlPoint22HasTwoPoints:0
-ControlPoint22ShortName:W
-ControlPoint22DataSheet:Type=Buoy###BREAKLINE###Color=White###BREAKLINE###Shape=Conical###BREAKLINE###Name=White S
-ControlPoint22Mark1Lon:-48.561337
-ControlPoint22Mark1Lat:-27.585883
+ControlPoint22UUID:aa831320-2dc8-0131-272c-60a44ce903c3
+ControlPoint22Name:Finish Pole-Cylinder
+ControlPoint22HasTwoPoints:1
+ControlPoint22ShortName:F
+ControlPoint22DataSheet:P1.Color=Black###BREAKLINE###P1.Type=Landmark###BREAKLINE###P1.Name=Finish Pole###BREAKLINE###P1.UUID=3240586c-83c0-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Black###BREAKLINE###P2.Shape=Cylinder###BREAKLINE###P2.Pattern=Checkered###BREAKLINE###P2.Name=Black Cylinder###BREAKLINE###P2.UUID=b153dfd6-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint22Mark1Lon:-48.557442
+ControlPoint22Mark1Lat:-27.587342
+ControlPoint22Mark2Lon:-48.562600
+ControlPoint22Mark2Lat:-27.585920
 
-ControlPoint23UUID:ca1aabf0-2dc9-0131-277c-60a44ce903c3
-ControlPoint23Name:Green-WhiteS
+ControlPoint23UUID:af4e4920-2dc9-0131-2772-60a44ce903c3
+ControlPoint23Name:Green-WhiteP
 ControlPoint23HasTwoPoints:1
-ControlPoint23ShortName:GS
-ControlPoint23DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Green###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=Green###BREAKLINE###P1.UUID=785c3e44-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=White###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=White S###BREAKLINE###P2.UUID=bf6777e6-83bd-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint23Mark1Lon:-48.562709999999996
-ControlPoint23Mark1Lat:-27.586253
-ControlPoint23Mark2Lon:-48.561337
-ControlPoint23Mark2Lat:-27.585883
+ControlPoint23ShortName:GP
+ControlPoint23DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Green###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=Green###BREAKLINE###P1.UUID=785c3e44-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=White###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=White P###BREAKLINE###P2.UUID=e9ec42f8-83bd-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint23Mark1Lon:-48.562470
+ControlPoint23Mark1Lat:-27.585780
+ControlPoint23Mark2Lon:-48.562482
+ControlPoint23Mark2Lat:-27.585808
 
-ControlPoint24UUID:d78695ea-83be-11e2-88c0-10bf48d758ce
-ControlPoint24Name:Black Conical
+ControlPoint24UUID:b153dfd6-83be-11e2-88c0-10bf48d758ce
+ControlPoint24Name:Black Cylinder
 ControlPoint24HasTwoPoints:0
 ControlPoint24ShortName:B
-ControlPoint24DataSheet:Type=Buoy###BREAKLINE###Color=Black###BREAKLINE###Shape=Conical###BREAKLINE###Pattern=Checkered###BREAKLINE###Name=Black Conical
-ControlPoint24Mark1Lon:-48.561523
-ControlPoint24Mark1Lat:-27.584017
+ControlPoint24DataSheet:Type=Buoy###BREAKLINE###Color=Black###BREAKLINE###Shape=Cylinder###BREAKLINE###Pattern=Checkered###BREAKLINE###Name=Black Cylinder
+ControlPoint24Mark1Lon:-48.562600
+ControlPoint24Mark1Lat:-27.585920
 
-ControlPoint25UUID:da6bf290-2dc8-0131-2736-60a44ce903c3
-ControlPoint25Name:Black Conical-Green
-ControlPoint25HasTwoPoints:1
-ControlPoint25ShortName:S
-ControlPoint25DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Black###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Pattern=Checkered###BREAKLINE###P1.Name=Black Conical###BREAKLINE###P1.UUID=d78695ea-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Green###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Green###BREAKLINE###P2.UUID=785c3e44-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint25Mark1Lon:-48.562709999999996
-ControlPoint25Mark1Lat:-27.586253
-ControlPoint25Mark2Lon:-48.560898
-ControlPoint25Mark2Lat:-27.585495
+ControlPoint25UUID:bf6777e6-83bd-11e2-88c0-10bf48d758ce
+ControlPoint25Name:White S
+ControlPoint25HasTwoPoints:0
+ControlPoint25ShortName:W
+ControlPoint25DataSheet:Type=Buoy###BREAKLINE###Color=White###BREAKLINE###Shape=Conical###BREAKLINE###Name=White S
+ControlPoint25Mark1Lon:-48.562603
+ControlPoint25Mark1Lat:-27.585983
 
-ControlPoint26UUID:e00b6730-2dc9-0131-2786-60a44ce903c3
-ControlPoint26Name:Green-Yellow
+ControlPoint26UUID:ca1aabf0-2dc9-0131-277c-60a44ce903c3
+ControlPoint26Name:Green-WhiteS
 ControlPoint26HasTwoPoints:1
-ControlPoint26ShortName:GY
-ControlPoint26DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Green###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=Green###BREAKLINE###P1.UUID=785c3e44-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Yellow###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Yellow###BREAKLINE###P2.UUID=3fdd2402-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint26Mark1Lon:-48.562709999999996
-ControlPoint26Mark1Lat:-27.586253
-ControlPoint26Mark2Lon:-48.558777
-ControlPoint26Mark2Lat:-27.575673
+ControlPoint26ShortName:GS
+ControlPoint26DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Green###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=Green###BREAKLINE###P1.UUID=785c3e44-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=White###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=White S###BREAKLINE###P2.UUID=bf6777e6-83bd-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint26Mark1Lon:-48.562470
+ControlPoint26Mark1Lat:-27.585780
+ControlPoint26Mark2Lon:-48.562603
+ControlPoint26Mark2Lat:-27.585983
 
-ControlPoint27UUID:e9ec42f8-83bd-11e2-88c0-10bf48d758ce
-ControlPoint27Name:White P
+ControlPoint27UUID:d78695ea-83be-11e2-88c0-10bf48d758ce
+ControlPoint27Name:Black Conical
 ControlPoint27HasTwoPoints:0
-ControlPoint27ShortName:W
-ControlPoint27DataSheet:Type=Buoy###BREAKLINE###Color=White###BREAKLINE###Shape=Conical###BREAKLINE###Name=White P
-ControlPoint27Mark1Lon:-48.560910
-ControlPoint27Mark1Lat:-27.585353
+ControlPoint27ShortName:B
+ControlPoint27DataSheet:Type=Buoy###BREAKLINE###Color=Black###BREAKLINE###Shape=Conical###BREAKLINE###Pattern=Checkered###BREAKLINE###Name=Black Conical
+ControlPoint27Mark1Lon:-48.561523
+ControlPoint27Mark1Lat:-27.584002
 
-ControlPoint28UUID:fc08e310-2dc9-0131-2790-60a44ce903c3
-ControlPoint28Name:Orange-Yellow
+ControlPoint28UUID:da6bf290-2dc8-0131-2736-60a44ce903c3
+ControlPoint28Name:Black Conical-Green
 ControlPoint28HasTwoPoints:1
-ControlPoint28ShortName:OY
-ControlPoint28DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Orange###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=Orange###BREAKLINE###P1.UUID=1286f15e-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Yellow###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Yellow###BREAKLINE###P2.UUID=3fdd2402-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint28Mark1Lon:-48.561082
-ControlPoint28Mark1Lat:-27.585780
-ControlPoint28Mark2Lon:-48.558777
-ControlPoint28Mark2Lat:-27.575673
+ControlPoint28ShortName:S
+ControlPoint28DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Black###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Pattern=Checkered###BREAKLINE###P1.Name=Black Conical###BREAKLINE###P1.UUID=d78695ea-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Green###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Green###BREAKLINE###P2.UUID=785c3e44-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint28Mark1Lon:-48.561523
+ControlPoint28Mark1Lat:-27.584002
+ControlPoint28Mark2Lon:-48.562470
+ControlPoint28Mark2Lat:-27.585780
 
-ControlPoint29UUID:fc09f220-2dc8-0131-2740-60a44ce903c3
-ControlPoint29Name:Black Conical-Red
+ControlPoint29UUID:e00b6730-2dc9-0131-2786-60a44ce903c3
+ControlPoint29Name:Green-Yellow
 ControlPoint29HasTwoPoints:1
-ControlPoint29ShortName:S
-ControlPoint29DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Black###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Pattern=Checkered###BREAKLINE###P1.Name=Black Conical###BREAKLINE###P1.UUID=d78695ea-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Red###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Red###BREAKLINE###P2.UUID=5427c7d2-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
-ControlPoint29Mark1Lon:-48.561523
-ControlPoint29Mark1Lat:-27.584017
-ControlPoint29Mark2Lon:-48.559833
-ControlPoint29Mark2Lat:-27.575753
+ControlPoint29ShortName:GY
+ControlPoint29DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Green###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=Green###BREAKLINE###P1.UUID=785c3e44-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Yellow###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Yellow###BREAKLINE###P2.UUID=3fdd2402-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint29Mark1Lon:-48.562470
+ControlPoint29Mark1Lat:-27.585780
+ControlPoint29Mark2Lon:-48.558770
+ControlPoint29Mark2Lat:-27.575680
+
+ControlPoint30UUID:e9ec42f8-83bd-11e2-88c0-10bf48d758ce
+ControlPoint30Name:White P
+ControlPoint30HasTwoPoints:0
+ControlPoint30ShortName:W
+ControlPoint30DataSheet:Type=Buoy###BREAKLINE###Color=White###BREAKLINE###Shape=Conical###BREAKLINE###Name=White P
+ControlPoint30Mark1Lon:-48.562482
+ControlPoint30Mark1Lat:-27.585808
+
+ControlPoint31UUID:fc08e310-2dc9-0131-2790-60a44ce903c3
+ControlPoint31Name:Orange-Yellow
+ControlPoint31HasTwoPoints:1
+ControlPoint31ShortName:OY
+ControlPoint31DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Orange###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Name=Orange###BREAKLINE###P1.UUID=1286f15e-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Yellow###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Yellow###BREAKLINE###P2.UUID=3fdd2402-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint31Mark1Lon:-48.562633
+ControlPoint31Mark1Lat:-27.586080
+ControlPoint31Mark2Lon:-48.558770
+ControlPoint31Mark2Lat:-27.575680
+
+ControlPoint32UUID:fc09f220-2dc8-0131-2740-60a44ce903c3
+ControlPoint32Name:Black Conical-Red
+ControlPoint32HasTwoPoints:1
+ControlPoint32ShortName:S
+ControlPoint32DataSheet:P1.Type=Buoy###BREAKLINE###P1.Color=Black###BREAKLINE###P1.Shape=Conical###BREAKLINE###P1.Pattern=Checkered###BREAKLINE###P1.Name=Black Conical###BREAKLINE###P1.UUID=d78695ea-83be-11e2-88c0-10bf48d758ce###BREAKLINE###P2.Type=Buoy###BREAKLINE###P2.Color=Red###BREAKLINE###P2.Shape=Conical###BREAKLINE###P2.Name=Red###BREAKLINE###P2.UUID=5427c7d2-83be-11e2-88c0-10bf48d758ce###BREAKLINE###
+ControlPoint32Mark1Lon:-48.561523
+ControlPoint32Mark1Lat:-27.584002
+ControlPoint32Mark2Lon:-48.559833
+ControlPoint32Mark2Lat:-27.575753
 
 
 SegmentFile:segments.php