diff --git a/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking.xtuml b/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking.xtuml
index aa80f21a7..b0d8947be 100644
--- a/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking.xtuml	
+++ b/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking.xtuml	
@@ -713,7 +713,16 @@ INSERT INTO SPR_RS
 	VALUES ("d9d00089-99ea-429a-9af0-86fc7db383e8",
 	'setTargetPressed',
 	'',
-	'',
+	'// Find the singleton instance of workout session, and if there is a 
+//   goal currently executing for it, notify it that its execution
+//   has completed.
+select any session from instances of WorkoutSession;
+if ( not empty session )
+  select one goal related by session->Goal[R11.''is currently executing''];
+  if ( not empty goal )
+    generate Goal1:Completed to goal;
+  end if;
+end if;',
 	1);
 INSERT INTO C_EP_PROXY
 	VALUES ("3e2d7574-ba3f-4a52-90c2-6787610b555a",
diff --git a/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Achievement/Achievement.xtuml b/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Achievement/Achievement.xtuml
index e5ce1ece3..84dc5bd35 100644
--- a/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Achievement/Achievement.xtuml	
+++ b/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Achievement/Achievement.xtuml	
@@ -5,9 +5,30 @@ INSERT INTO O_OBJ
 	'Achievement',
 	10,
 	'Achievement',
-	'Each instance represents one contiguous period of time during 
+	'Each instance represents one contiguous period of time during 
 which a particular goal was being met (achieved).',
 	"00000000-0000-0000-0000-000000000000");
+INSERT INTO O_TFR
+	VALUES ("6fac41c9-c339-4dbe-8651-11ff5f9db899",
+	"313e48f7-0516-49bd-9401-5c67c2e55db9",
+	'close',
+	'',
+	"ba5eda7a-def5-0000-0000-000000000000",
+	1,
+	'// Close this open achievement record by storing the end time, relating this
+//   record as a recorded one and unrelating it as the open one.
+select one goal related by self->Goal[R14.''is open for''];
+select one workoutTimer related by 
+  goal->WorkoutSession[R11.''is currently executing within'']->WorkoutTimer[R8.''is timed by''];
+  self.endTime = workoutTimer.time;
+unrelate self from goal across R14.''is open for'';
+relate self to goal across R12.''specifies achievement of'';
+
+
+',
+	1,
+	'',
+	"00000000-0000-0000-0000-000000000000");
 INSERT INTO O_NBATTR
 	VALUES ("b3949e0b-65ec-4e72-82be-b899f2e3b63b",
 	"313e48f7-0516-49bd-9401-5c67c2e55db9");
@@ -19,7 +40,7 @@ INSERT INTO O_ATTR
 	"313e48f7-0516-49bd-9401-5c67c2e55db9",
 	"00000000-0000-0000-0000-000000000000",
 	'startTime',
-	'Starting time for this achievement, expressed as the number of seconds
+	'Starting time for this achievement, expressed as the number of seconds
 since the beginning of the associated workout session.',
 	'',
 	'startTime',
@@ -38,7 +59,7 @@ INSERT INTO O_ATTR
 	"313e48f7-0516-49bd-9401-5c67c2e55db9",
 	"b3949e0b-65ec-4e72-82be-b899f2e3b63b",
 	'endTime',
-	'Ending time for this achievement, expressed as the number of seconds
+	'Ending time for this achievement, expressed as the number of seconds
 since the beginning of the associated workout session.',
 	'',
 	'endTime',
diff --git a/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Goal/Goal.xtuml b/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Goal/Goal.xtuml
index c4e71f7a0..3145ae3c2 100644
--- a/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Goal/Goal.xtuml	
+++ b/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Goal/Goal.xtuml	
@@ -16,8 +16,31 @@ INSERT INTO O_TFR
 	'',
 	"ba5eda7a-def5-0000-0000-000000000000",
 	0,
-	'',
-	3,
+	'// Create and activate an instance of a goal specified by
+//   the goal specification identified by the incoming parameter.
+
+// Find the goal specification for this goal, then
+//   create and relate this goal to the specification
+//   and to the singleton workout session.
+select any goalSpec from instances of GoalSpec 
+  where ( selected.SequenceNumber == param.sequenceNumber );
+create object instance goal of Goal;
+relate goal to goalSpec across R9.''specified by'';
+select any session from instances of WorkoutSession;
+relate goal to session across R11.''is currently executing within'';
+
+// Initialize this goal.
+goal.calculateStart();
+goal.isBeingAchieved = false;
+
+// Start a timer that periodically causes evaluation of goal achievement.
+create event instance evaluateEvent of Goal2:Evaluate to goal;
+goal.evaluationTimer = TIM::timer_start_recurring( event_inst: evaluateEvent, microseconds: evaluationPeriod );
+
+
+
+',
+	1,
 	'',
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO O_TPARM
@@ -29,6 +52,129 @@ INSERT INTO O_TPARM
 	'',
 	"00000000-0000-0000-0000-000000000000",
 	'Sequence number of the goal specification for which an instance of a goal should be created.');
+INSERT INTO O_TFR
+	VALUES ("b3215204-3d02-48ba-9794-25ddbc40009c",
+	"c1022670-c44d-401e-bb23-dfcef6084fba",
+	'calculateStart',
+	'',
+	"ba5eda7a-def5-0000-0000-000000000000",
+	1,
+	'// Based on the span type for this goal, calculate and
+//   store the value of the start attribute.
+select one goalSpec related by self->GoalSpec[R9.''specified by''];
+if ( goalSpec.SpanType == GoalSpan::Time )
+  select one workoutTimer related by 
+    self->WorkoutSession[R11.''is currently executing within'']->WorkoutTimer[R8.''is timed by''];
+  self.start = workoutTimer.time;
+elif ( goalSpec.SpanType == GoalSpan::Distance )
+  select one session related by self->WorkoutSession[R11.''is currently executing within''];
+  self.start = session.accumulatedDistance;
+else
+  LOG::LogFailure( message: "Goal.calculateStart: Unknown Goal Span Type." );
+end if;',
+	1,
+	'',
+	"8ac30761-d43a-49d9-b7e4-c3ec442ea9f3");
+INSERT INTO O_TFR
+	VALUES ("2b884ff8-637a-468b-a2fa-f96b8ef98b0a",
+	"c1022670-c44d-401e-bb23-dfcef6084fba",
+	'evaluateAchievement',
+	'',
+	"ba5eda7a-def5-0000-0000-000000000000",
+	1,
+	'// Based on the type of goal, determine whether this one is 
+//   currently being achieved and update the appropriate attribute.
+
+// Find the related goal specification and workout session for this goal.
+select one goalSpec related by self->GoalSpec[R9.''specified by''];
+select one session related by self->WorkoutSession[R11.''is currently executing within''];
+
+// Based on the goal criteria type, get the appropriate current value
+//   for comparison against the criteria (minimum and maximum).
+currentValue = 0.0;  // Explicit declaration
+if ( goalSpec.CriteriaType == GoalCriteria::HeartRate )
+  currentValue = session.currentHeartRate;
+elif ( goalSpec.CriteriaType == GoalCriteria::Pace )
+  currentValue = session.currentPace;
+else
+  LOG::LogFailure( message: "Goal.evaluateAchievement: Unknown Goal Criteria Type." );
+end if;
+
+// Save current value for handling of achievement records.
+previousAchievement = self.isBeingAchieved;  
+ 
+// Compare the current value against the criteria and update the attribute 
+//   indicating goal achievement status.
+if ( (goalSpec.Minimum <= currentValue) and (currentValue <= goalSpec.Maximum) )
+  self.isBeingAchieved = true;
+else
+  self.isBeingAchieved = false;
+end if;
+
+// Update achievement records if necessary.  There are four cases:
+//   0. Still not achieving this goal. 
+//   1. Just started achieving this goal.
+//   2. Just stopped achieving this goal.
+//   3. Still achieving this goal.
+// For cases 0 and 3, there is nothing to be done for achievement records.
+// Case 1 requires the creation of a new achievment record, storing the start time.
+// Case 2 requires the storing of the end time for the open achievement record.
+if ( (not previousAchievement) and self.isBeingAchieved )
+  // Case 1, create achievement record, store start time, relate it as open record.
+  create object instance achievement of Achievement;
+  relate self to achievement across R14.''has open'';
+  select one workoutTimer related by session->WorkoutTimer[R8.''is timed by''];
+  achievement.startTime = workoutTimer.time;
+elif ( previousAchievement and (not self.isBeingAchieved) )
+  // Case 2, store end time, relate as recorded record, unrelate as open record.
+  select one achievement related by self->Achievement[R14.''has open''];
+  achievement.close();
+end if;
+',
+	1,
+	'',
+	"b3215204-3d02-48ba-9794-25ddbc40009c");
+INSERT INTO O_TFR
+	VALUES ("7090ad22-2865-4836-a89f-a46b868d3ac0",
+	"c1022670-c44d-401e-bb23-dfcef6084fba",
+	'evaluateCompletion',
+	'',
+	"ba5eda7a-def5-0000-0000-000000000000",
+	1,
+	'// Based on the span type for this goal, determine 
+//  whether it has been completed, update achievement
+//  records as necessary, and advance to the next goal
+//  if appropriate.
+
+select one goalSpec related by self->GoalSpec[R9.''specified by''];
+
+// Based on the span type for the goal, get the elapsed span 
+//   for comparison against the specified span for the goal.
+elapsedSpan = 0.0;  // Explicit declaration
+if ( goalSpec.SpanType == GoalSpan::Distance )
+  select one session related by self->WorkoutSession[R11.''is currently executing within''];
+  elapsedSpan = session.accumulatedDistance - self.start;
+elif ( goalSpec.SpanType == GoalSpan::Time )
+  select one workoutTimer related by 
+    self->WorkoutSession[R11.''is currently executing within'']->WorkoutTimer[R8.''is timed by''];
+  elapsedSpan = workoutTimer.time - self.start;
+else
+  LOG::LogFailure( message: "Goal.evaluateCompletion: Unknown Goal Span Type." );
+end if;
+
+// Compare the current value against the specified span to determine 
+//   whether the execution of this workout goal is complete.
+if ( elapsedSpan >= goalSpec.Span )
+  select one openAchievement related by self->Achievement[R14.''has open''];
+  if ( not empty openAchievement )
+    openAchievement.close();
+  end if;
+  generate Goal1:Completed to self;
+end if;
+',
+	1,
+	'',
+	"2b884ff8-637a-468b-a2fa-f96b8ef98b0a");
 INSERT INTO O_NBATTR
 	VALUES ("fa9000ac-0495-47fe-bbaf-66bc8f9a4f0a",
 	"c1022670-c44d-401e-bb23-dfcef6084fba");
@@ -58,17 +204,17 @@ INSERT INTO O_ATTR
 	"c1022670-c44d-401e-bb23-dfcef6084fba",
 	"645a58ca-7e54-4f1b-bb56-64249dab5aaa",
 	'start',
-	'Captures the starting point of the span for this particular goal so 
-that the end of the goal execution period can be determined.  In other
-words, using the value of this attribute together with the span specified
-by the associated goal specification, the goal knows it is finished.
-
-For distance-based goals, it is expressed as the accumulated distance
-in meters for the associated workout session at the time this goal
-execution commenced.
-
-For time-based goals, it is expressed as the elapsed time in seconds
-for the associated workout session at the time this goal execution
+	'Captures the starting point of the span for this particular goal so 
+that the end of the goal execution period can be determined.  In other
+words, using the value of this attribute together with the span specified
+by the associated goal specification, the goal knows when it is finished.
+
+For distance-based goals, it is expressed as the accumulated distance
+in meters for the associated workout session at the time this goal
+execution commenced.
+
+For time-based goals, it is expressed as the elapsed time in seconds
+for the associated workout session at the time this goal execution
 commenced.',
 	'',
 	'start',
@@ -103,7 +249,7 @@ INSERT INTO O_BATTR
 INSERT INTO O_ATTR
 	VALUES ("c307e400-f06b-4450-8e3c-94dadad961ff",
 	"c1022670-c44d-401e-bb23-dfcef6084fba",
-	"fa9000ac-0495-47fe-bbaf-66bc8f9a4f0a",
+	"0078004b-9cab-4a56-beac-5014d746ad80",
 	'current_state',
 	'',
 	'',
@@ -112,6 +258,24 @@ INSERT INTO O_ATTR
 	"ba5eda7a-def5-0000-0000-000000000006",
 	'',
 	'');
+INSERT INTO O_NBATTR
+	VALUES ("0078004b-9cab-4a56-beac-5014d746ad80",
+	"c1022670-c44d-401e-bb23-dfcef6084fba");
+INSERT INTO O_BATTR
+	VALUES ("0078004b-9cab-4a56-beac-5014d746ad80",
+	"c1022670-c44d-401e-bb23-dfcef6084fba");
+INSERT INTO O_ATTR
+	VALUES ("0078004b-9cab-4a56-beac-5014d746ad80",
+	"c1022670-c44d-401e-bb23-dfcef6084fba",
+	"fa9000ac-0495-47fe-bbaf-66bc8f9a4f0a",
+	'evaluationTimer',
+	'Handle for the timer used for periodic evaluation of goal achievement.',
+	'',
+	'evaluationTimer',
+	0,
+	"ba5eda7a-def5-0000-0000-00000000000f",
+	'',
+	'');
 INSERT INTO O_ID
 	VALUES (0,
 	"c1022670-c44d-401e-bb23-dfcef6084fba");
diff --git a/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Goal/InstanceStateMachine/InstanceStateMachine.xtuml b/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Goal/InstanceStateMachine/InstanceStateMachine.xtuml
index 201803d9e..8712eb054 100644
--- a/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Goal/InstanceStateMachine/InstanceStateMachine.xtuml	
+++ b/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Goal/InstanceStateMachine/InstanceStateMachine.xtuml	
@@ -22,11 +22,11 @@ INSERT INTO SM_EVT
 	"7fc80988-4415-437c-acc5-4c130cc2715d",
 	"00000000-0000-0000-0000-000000000000",
 	1,
-	'SpanExhausted',
+	'Completed',
 	0,
 	'',
 	'Goal1',
-	'Indicates that the span for this particular goal has been exhausted.');
+	'Indicates that execution of this goal has been completed.  ');
 INSERT INTO SM_LEVT
 	VALUES ("5706c37b-a57c-4258-ad16-eba5b972f5bf",
 	"7fc80988-4415-437c-acc5-4c130cc2715d",
@@ -123,8 +123,13 @@ INSERT INTO SM_AH
 INSERT INTO SM_ACT
 	VALUES ("68a5f818-7dab-42d9-8593-79e79e2cc28b",
 	"7fc80988-4415-437c-acc5-4c130cc2715d",
-	3,
-	'',
+	1,
+	'// Determine whether this goal is currently being achieved.
+self.evaluateAchievement();
+
+// Determine whether execution of this goal is complete, 
+//  and if so, advance to the next one if it exists.
+self.evaluateCompletion();',
 	'');
 INSERT INTO SM_MOAH
 	VALUES ("4c799586-a213-493c-8525-7d7046820ad2",
@@ -139,14 +144,18 @@ INSERT INTO SM_ACT
 	1,
 	'// Stop executing this goal and begin executing the next one, if there is one.
 
-// First, add this goal to the collection of those that have already executed.
+// Stop the goal-evaluation timer, ignoring the return code which indicates 
+//   whether a timer event was in flight when the timer was cancelled.
+cancelSucceeded = TIM::timer_cancel( timer_inst_ref: self.evaluationTimer );
+
+// Add this goal to the collection of those that have already executed.
 select one session related by self->WorkoutSession[R11.''is currently executing within''];
 relate self to session across R13.''was executed within'';
 
-// Next, remove this goal from the collection of currently executing ones.
+// Remove this goal from the collection of currently executing ones.
 unrelate self from session across R11.''is currently executing within'';
 
-// Finally, find the next goal specification in the sequence and start executing it, if it exists.
+// Find the next goal specification in the sequence and start executing it, if it exists.
 select one currentGoalSpec related by self->GoalSpec[R9.''specified by''];
 
 select any nextGoalSpec related by session->GoalSpec[R10.''includes'']
@@ -214,11 +223,11 @@ INSERT INTO GD_SHP
 INSERT INTO GD_NCS
 	VALUES ("11ca3dfe-8c51-49db-951f-4bcf9c349dd7");
 INSERT INTO DIM_ND
-	VALUES (204.000000,
+	VALUES (349.000000,
 	144.000000,
 	"11ca3dfe-8c51-49db-951f-4bcf9c349dd7");
 INSERT INTO DIM_GE
-	VALUES (4200.000000,
+	VALUES (4104.000000,
 	3084.000000,
 	"11ca3dfe-8c51-49db-951f-4bcf9c349dd7",
 	"00000000-0000-0000-0000-000000000000");
@@ -228,7 +237,7 @@ INSERT INTO DIM_ELE
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_CON
 	VALUES ("bf1c05cb-62f4-4158-a22c-f1eea42f07d2",
-	4404.000000,
+	4453.000000,
 	3132.000000,
 	"11ca3dfe-8c51-49db-951f-4bcf9c349dd7");
 INSERT INTO DIM_CON
@@ -238,7 +247,7 @@ INSERT INTO DIM_CON
 	"11ca3dfe-8c51-49db-951f-4bcf9c349dd7");
 INSERT INTO DIM_CON
 	VALUES ("0bbfb44f-3419-4927-b876-00cde45ded43",
-	4200.000000,
+	4104.000000,
 	3168.000000,
 	"11ca3dfe-8c51-49db-951f-4bcf9c349dd7");
 INSERT INTO DIM_CON
@@ -258,11 +267,11 @@ INSERT INTO GD_SHP
 INSERT INTO GD_NCS
 	VALUES ("70725233-fd31-4b3f-8009-40b0e332d040");
 INSERT INTO DIM_ND
-	VALUES (204.000000,
-	156.000000,
+	VALUES (481.000000,
+	409.000000,
 	"70725233-fd31-4b3f-8009-40b0e332d040");
 INSERT INTO DIM_GE
-	VALUES (4656.000000,
+	VALUES (4704.000000,
 	3084.000000,
 	"70725233-fd31-4b3f-8009-40b0e332d040",
 	"00000000-0000-0000-0000-000000000000");
@@ -272,7 +281,7 @@ INSERT INTO DIM_ELE
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_CON
 	VALUES ("6671936b-d4ef-4c36-95c4-d01cd8e0969b",
-	4656.000000,
+	4704.000000,
 	3132.000000,
 	"70725233-fd31-4b3f-8009-40b0e332d040");
 INSERT INTO DIM_CON
@@ -286,7 +295,7 @@ INSERT INTO GD_GE
 	"4d3b865b-a2b5-49a9-8f19-a163f108922a",
 	42,
 	0,
-	'GPS Watch::Library::Tracking::Tracking::Goal::Instance State Machine::Executing::Goal1: SpanExhausted');
+	'GPS Watch::Library::Tracking::Tracking::Goal::Instance State Machine::Executing::Goal1: Completed');
 INSERT INTO GD_CON
 	VALUES ("a8cd31e1-a403-49b2-82c8-0177f95634c1",
 	"00000000-0000-0000-0000-000000000000");
@@ -320,7 +329,7 @@ INSERT INTO DIM_ND
 	0.000000,
 	"70c82ccc-754d-4204-969b-f9f10d735b95");
 INSERT INTO DIM_GE
-	VALUES (4413.000000,
+	VALUES (4461.500000,
 	3103.000000,
 	"70c82ccc-754d-4204-969b-f9f10d735b95",
 	"00000000-0000-0000-0000-000000000000");
@@ -355,14 +364,14 @@ INSERT INTO GD_LS
 	"c7c86751-1ec7-4a14-bfc5-6efe3cf22dc0");
 INSERT INTO DIM_WAY
 	VALUES ("fc9c1379-7b56-49eb-ae7d-9e56700c41de",
-	4404.000000,
+	4453.000000,
 	3132.000000,
 	"a8cd31e1-a403-49b2-82c8-0177f95634c1",
 	"00000000-0000-0000-0000-000000000000",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_WAY
 	VALUES ("c7c86751-1ec7-4a14-bfc5-6efe3cf22dc0",
-	4656.000000,
+	4704.000000,
 	3132.000000,
 	"a8cd31e1-a403-49b2-82c8-0177f95634c1",
 	"00000000-0000-0000-0000-000000000000",
@@ -420,8 +429,8 @@ INSERT INTO DIM_ND
 	0.000000,
 	"e1d94218-45bd-4a86-b11b-6f59bcb293cf");
 INSERT INTO DIM_GE
-	VALUES (4081.000000,
-	3136.000000,
+	VALUES (4063.000000,
+	3288.000000,
 	"e1d94218-45bd-4a86-b11b-6f59bcb293cf",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -473,7 +482,7 @@ INSERT INTO GD_LS
 	"2eaff31b-b4cc-40a6-85bb-c6fe24d1a178");
 INSERT INTO DIM_WAY
 	VALUES ("50902b0d-47ea-4166-939d-cde182942486",
-	4200.000000,
+	4104.000000,
 	3168.000000,
 	"0907b6e7-e62c-41be-99cd-693a2cd24c46",
 	"00000000-0000-0000-0000-000000000000",
@@ -487,22 +496,22 @@ INSERT INTO DIM_WAY
 	"50902b0d-47ea-4166-939d-cde182942486");
 INSERT INTO DIM_WAY
 	VALUES ("58a283a5-d132-4f2e-8367-6207efd9ca28",
-	4150.000000,
+	4054.000000,
 	3168.000000,
 	"0907b6e7-e62c-41be-99cd-693a2cd24c46",
 	"00000000-0000-0000-0000-000000000000",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_WAY
 	VALUES ("83eee3fc-a8fa-4232-a079-2b24acf13826",
-	4150.000000,
-	3277.000000,
+	4054.000000,
+	3276.000000,
 	"0907b6e7-e62c-41be-99cd-693a2cd24c46",
 	"00000000-0000-0000-0000-000000000000",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_WAY
 	VALUES ("d8153263-61d3-4146-9854-5211354cb02b",
 	4320.000000,
-	3277.000000,
+	3276.000000,
 	"0907b6e7-e62c-41be-99cd-693a2cd24c46",
 	"00000000-0000-0000-0000-000000000000",
 	"00000000-0000-0000-0000-000000000000");
diff --git a/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Goal/evaluateCompletion__Operation.oal b/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Goal/evaluateCompletion__Operation.oal
new file mode 100644
index 000000000..7d9bca2a1
Binary files /dev/null and b/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Goal/evaluateCompletion__Operation.oal differ
diff --git a/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Tracking.xtuml b/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Tracking.xtuml
index ce92a7b1c..381a615f2 100644
--- a/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Tracking.xtuml	
+++ b/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Tracking.xtuml	
@@ -43,7 +43,7 @@ INSERT INTO DIM_ND
 	"7adb6fbc-4732-4c9e-a166-5bd6027ec36f");
 INSERT INTO DIM_GE
 	VALUES (4020.000000,
-	2772.000000,
+	2700.000000,
 	"7adb6fbc-4732-4c9e-a166-5bd6027ec36f",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -63,7 +63,7 @@ INSERT INTO DIM_CON
 INSERT INTO DIM_CON
 	VALUES ("3bd0a3df-05a4-4512-a4c4-5a7470b6be32",
 	4236.000000,
-	2831.000000,
+	2771.000000,
 	"7adb6fbc-4732-4c9e-a166-5bd6027ec36f");
 INSERT INTO GD_GE
 	VALUES ("fed77c59-76ee-4a33-aabf-456f3105472a",
@@ -117,7 +117,7 @@ INSERT INTO DIM_CON
 INSERT INTO DIM_CON
 	VALUES ("d26645cf-e947-42ed-9e5e-7f743f9f23ce",
 	4512.000000,
-	3191.000000,
+	3167.000000,
 	"fed77c59-76ee-4a33-aabf-456f3105472a");
 INSERT INTO DIM_CON
 	VALUES ("ca421cf4-61fe-448f-ab52-612988da4ed5",
@@ -521,7 +521,7 @@ INSERT INTO DIM_ND
 	"84586405-3a5c-47b1-b8c8-b846974dd16d");
 INSERT INTO DIM_GE
 	VALUES (4116.000000,
-	3156.000000,
+	3108.000000,
 	"84586405-3a5c-47b1-b8c8-b846974dd16d",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -531,7 +531,7 @@ INSERT INTO DIM_ELE
 INSERT INTO DIM_CON
 	VALUES ("991da7fe-7956-491d-b69f-a97782e8eb81",
 	4316.000000,
-	3192.000000,
+	3167.000000,
 	"84586405-3a5c-47b1-b8c8-b846974dd16d");
 INSERT INTO GD_GE
 	VALUES ("fa683408-902f-445c-9892-2e61f0896335",
@@ -555,7 +555,7 @@ INSERT INTO DIM_ND
 	"efcbffc8-3ae4-4a5a-880c-11664633e587");
 INSERT INTO DIM_GE
 	VALUES (4314.000000,
-	3188.000000,
+	3163.000000,
 	"efcbffc8-3ae4-4a5a-880c-11664633e587",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -574,7 +574,7 @@ INSERT INTO DIM_ND
 	"8baab843-52fb-4709-ab6e-973e260d4f57");
 INSERT INTO DIM_GE
 	VALUES (4390.000000,
-	3167.000000,
+	3143.000000,
 	"8baab843-52fb-4709-ab6e-973e260d4f57",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -593,7 +593,7 @@ INSERT INTO DIM_ND
 	"7a5870c3-41ba-40cd-acce-8b1fae558b16");
 INSERT INTO DIM_GE
 	VALUES (4445.000000,
-	3195.000000,
+	3171.000000,
 	"7a5870c3-41ba-40cd-acce-8b1fae558b16",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -609,14 +609,14 @@ INSERT INTO GD_LS
 INSERT INTO DIM_WAY
 	VALUES ("aaf99113-83cd-4375-863b-773b5d2f84db",
 	4316.000000,
-	3192.000000,
+	3167.000000,
 	"fa683408-902f-445c-9892-2e61f0896335",
 	"00000000-0000-0000-0000-000000000000",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_WAY
 	VALUES ("babae7db-513c-4afb-a1cc-5cdcd390acf9",
 	4512.000000,
-	3191.000000,
+	3167.000000,
 	"fa683408-902f-445c-9892-2e61f0896335",
 	"00000000-0000-0000-0000-000000000000",
 	"00000000-0000-0000-0000-000000000000");
@@ -650,7 +650,7 @@ INSERT INTO DIM_ND
 	"c85dddfc-7bfd-4a3a-924d-c08dfb7789fc");
 INSERT INTO DIM_GE
 	VALUES (4020.000000,
-	2988.000000,
+	2904.000000,
 	"c85dddfc-7bfd-4a3a-924d-c08dfb7789fc",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -675,7 +675,7 @@ INSERT INTO DIM_CON
 INSERT INTO DIM_CON
 	VALUES ("1c984d5f-b52e-4939-9c2b-a85c90354056",
 	4220.000000,
-	3047.000000,
+	2928.000000,
 	"c85dddfc-7bfd-4a3a-924d-c08dfb7789fc");
 INSERT INTO GD_GE
 	VALUES ("17626a8c-5485-4483-a50d-c2aeb018ecea",
@@ -738,7 +738,7 @@ INSERT INTO DIM_CON
 INSERT INTO DIM_CON
 	VALUES ("bd116b37-576a-4580-a32e-e5622f86e369",
 	4441.000000,
-	2832.000000,
+	2771.000000,
 	"b8bf682c-54fe-4d15-8a5d-d3ce1bba7d47");
 INSERT INTO DIM_CON
 	VALUES ("a849f130-36e3-4242-a3d6-addc4f24fcda",
@@ -887,7 +887,7 @@ INSERT INTO DIM_ND
 	"2e6cab8c-d8ad-4a96-b1cf-d85106251768");
 INSERT INTO DIM_GE
 	VALUES (4356.000000,
-	2828.000000,
+	2767.000000,
 	"2e6cab8c-d8ad-4a96-b1cf-d85106251768",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -905,8 +905,8 @@ INSERT INTO DIM_ND
 	0.000000,
 	"78c730bd-f294-4a57-a0e9-9b8a53b5e2cc");
 INSERT INTO DIM_GE
-	VALUES (4332.500000,
-	2791.500000,
+	VALUES (4332.000000,
+	2731.000000,
 	"78c730bd-f294-4a57-a0e9-9b8a53b5e2cc",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -925,7 +925,7 @@ INSERT INTO DIM_ND
 	"29f85a84-bcf0-4ea3-bfb9-899af5e0bb00");
 INSERT INTO DIM_GE
 	VALUES (4234.000000,
-	2835.000000,
+	2775.000000,
 	"29f85a84-bcf0-4ea3-bfb9-899af5e0bb00",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -941,14 +941,14 @@ INSERT INTO GD_LS
 INSERT INTO DIM_WAY
 	VALUES ("c4bd431b-d449-4e9a-b35c-ff188b731578",
 	4441.000000,
-	2832.000000,
+	2771.000000,
 	"8d959a91-9dd3-4a39-af25-bfff9fb7a894",
 	"00000000-0000-0000-0000-000000000000",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_WAY
 	VALUES ("b203cd37-6f29-4ee6-96ba-fbc56ce95225",
 	4236.000000,
-	2831.000000,
+	2771.000000,
 	"8d959a91-9dd3-4a39-af25-bfff9fb7a894",
 	"00000000-0000-0000-0000-000000000000",
 	"c4bd431b-d449-4e9a-b35c-ff188b731578");
@@ -1087,7 +1087,7 @@ INSERT INTO DIM_ND
 	"40c3f186-2b44-4174-8bf2-8f036b5a1418");
 INSERT INTO DIM_GE
 	VALUES (4220.000000,
-	3053.000000,
+	2934.000000,
 	"40c3f186-2b44-4174-8bf2-8f036b5a1418",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -1105,8 +1105,8 @@ INSERT INTO DIM_ND
 	0.000000,
 	"75a0a8f3-1b58-4555-83a2-c94327f6402c");
 INSERT INTO DIM_GE
-	VALUES (4356.000000,
-	2991.000000,
+	VALUES (4321.000000,
+	2904.000000,
 	"75a0a8f3-1b58-4555-83a2-c94327f6402c",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -1124,7 +1124,7 @@ INSERT INTO DIM_ND
 	40.000000,
 	"5c5b0ead-9457-47fd-920c-c9ced2c96257");
 INSERT INTO DIM_GE
-	VALUES (4363.000000,
+	VALUES (4356.000000,
 	2929.000000,
 	"5c5b0ead-9457-47fd-920c-c9ced2c96257",
 	"00000000-0000-0000-0000-000000000000");
@@ -1139,21 +1139,15 @@ INSERT INTO GD_LS
 	"9cb3540f-3851-4f83-bde8-59fe96be92fd",
 	"83cdcbe5-dfe9-47bc-921e-98e48983f76a");
 INSERT INTO GD_LS
-	VALUES ("8b257581-c6de-4acf-bd94-e54f818fef20",
+	VALUES ("b9f564e2-0e7a-4db0-a777-d2c3907d6c81",
 	"61caeb60-d784-4cc9-9e84-f6fc041b2fdb",
 	"69aa993a-cc17-407f-9e21-804d87602498",
 	"83cdcbe5-dfe9-47bc-921e-98e48983f76a",
-	"c882baba-fd55-4114-b47f-008086268d67");
-INSERT INTO GD_LS
-	VALUES ("b9f564e2-0e7a-4db0-a777-d2c3907d6c81",
-	"61caeb60-d784-4cc9-9e84-f6fc041b2fdb",
-	"8b257581-c6de-4acf-bd94-e54f818fef20",
-	"c882baba-fd55-4114-b47f-008086268d67",
 	"c99f82a1-142b-4704-905c-f801546e5c86");
 INSERT INTO DIM_WAY
 	VALUES ("9cb3540f-3851-4f83-bde8-59fe96be92fd",
 	4220.000000,
-	3047.000000,
+	2928.000000,
 	"61caeb60-d784-4cc9-9e84-f6fc041b2fdb",
 	"00000000-0000-0000-0000-000000000000",
 	"00000000-0000-0000-0000-000000000000");
@@ -1167,13 +1161,6 @@ INSERT INTO DIM_WAY
 INSERT INTO DIM_WAY
 	VALUES ("83cdcbe5-dfe9-47bc-921e-98e48983f76a",
 	4351.000000,
-	3047.000000,
-	"61caeb60-d784-4cc9-9e84-f6fc041b2fdb",
-	"00000000-0000-0000-0000-000000000000",
-	"00000000-0000-0000-0000-000000000000");
-INSERT INTO DIM_WAY
-	VALUES ("c882baba-fd55-4114-b47f-008086268d67",
-	4351.000000,
 	2928.000000,
 	"61caeb60-d784-4cc9-9e84-f6fc041b2fdb",
 	"00000000-0000-0000-0000-000000000000",
@@ -1248,7 +1235,7 @@ INSERT INTO GD_NCS
 	VALUES ("3887602c-a982-48ec-a090-b638417c9f19");
 INSERT INTO DIM_ND
 	VALUES (253.000000,
-	157.000000,
+	204.000000,
 	"3887602c-a982-48ec-a090-b638417c9f19");
 INSERT INTO DIM_GE
 	VALUES (4704.000000,
@@ -1276,18 +1263,23 @@ INSERT INTO DIM_CON
 	"3887602c-a982-48ec-a090-b638417c9f19");
 INSERT INTO DIM_CON
 	VALUES ("39c2e4fc-1b7f-4d5d-b115-a8f981710b79",
-	4859.000000,
-	2569.000000,
+	4860.000000,
+	2616.000000,
 	"3887602c-a982-48ec-a090-b638417c9f19");
 INSERT INTO DIM_CON
 	VALUES ("5e91158a-34ad-45ac-a192-89f633752c24",
 	4957.000000,
-	2483.000000,
+	2470.000000,
 	"3887602c-a982-48ec-a090-b638417c9f19");
 INSERT INTO DIM_CON
 	VALUES ("e008d171-9205-4a0e-8b56-9c60cc6b974e",
-	4715.000000,
-	2569.000000,
+	4716.000000,
+	2616.000000,
+	"3887602c-a982-48ec-a090-b638417c9f19");
+INSERT INTO DIM_CON
+	VALUES ("29140171-75ee-4860-be5b-6ca350618bd3",
+	4957.000000,
+	2541.000000,
 	"3887602c-a982-48ec-a090-b638417c9f19");
 INSERT INTO GD_GE
 	VALUES ("d626f64d-1b05-4c56-b7ef-965d52705b8f",
@@ -1316,7 +1308,12 @@ INSERT INTO DIM_ELE
 INSERT INTO DIM_CON
 	VALUES ("5bd41631-4176-44dd-9be4-d2d27f55f4a0",
 	5196.000000,
-	2484.000000,
+	2470.000000,
+	"d626f64d-1b05-4c56-b7ef-965d52705b8f");
+INSERT INTO DIM_CON
+	VALUES ("8f6c52e4-d842-40ad-a4a3-3fb15ed23aa7",
+	5196.000000,
+	2541.000000,
 	"d626f64d-1b05-4c56-b7ef-965d52705b8f");
 INSERT INTO GD_GE
 	VALUES ("d34f397a-7410-4d6a-8280-af68576c9b59",
@@ -1558,8 +1555,8 @@ INSERT INTO DIM_ND
 	0.000000,
 	"07ac5dbd-4bf2-4218-a9a8-dc9db8287202");
 INSERT INTO DIM_GE
-	VALUES (4815.000000,
-	2646.000000,
+	VALUES (4815.500000,
+	2669.500000,
 	"07ac5dbd-4bf2-4218-a9a8-dc9db8287202",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -1577,8 +1574,8 @@ INSERT INTO DIM_ND
 	0.000000,
 	"ee5884eb-b952-4b9d-b66c-670972ded500");
 INSERT INTO DIM_GE
-	VALUES (4863.000000,
-	2569.000000,
+	VALUES (4864.000000,
+	2616.000000,
 	"ee5884eb-b952-4b9d-b66c-670972ded500",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -1600,8 +1597,8 @@ INSERT INTO DIM_WAY
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_WAY
 	VALUES ("2a2ffb42-4fad-4d57-9663-ae7884acbd08",
-	4859.000000,
-	2569.000000,
+	4860.000000,
+	2616.000000,
 	"59766673-8247-4ca1-9a36-ec9afa2ca415",
 	"00000000-0000-0000-0000-000000000000",
 	"cc36f52e-6251-4a4f-9a3a-a9c5065b5745");
@@ -1640,7 +1637,7 @@ INSERT INTO DIM_ND
 	"7d57a961-e970-4c14-87a7-6f5e5bf2714a");
 INSERT INTO DIM_GE
 	VALUES (4953.000000,
-	2486.000000,
+	2472.000000,
 	"7d57a961-e970-4c14-87a7-6f5e5bf2714a",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -1659,7 +1656,7 @@ INSERT INTO DIM_ND
 	"d2bda14d-c934-4ead-8534-fcdc837e51c2");
 INSERT INTO DIM_GE
 	VALUES (5067.000000,
-	2443.500000,
+	2429.000000,
 	"d2bda14d-c934-4ead-8534-fcdc837e51c2",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -1678,7 +1675,7 @@ INSERT INTO DIM_ND
 	"47f0c61a-ea2a-49df-b96f-3205d107b395");
 INSERT INTO DIM_GE
 	VALUES (5117.000000,
-	2486.000000,
+	2472.000000,
 	"47f0c61a-ea2a-49df-b96f-3205d107b395",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -1694,14 +1691,14 @@ INSERT INTO GD_LS
 INSERT INTO DIM_WAY
 	VALUES ("ea5f8537-6ab8-4755-895c-0fa34f500142",
 	4957.000000,
-	2483.000000,
+	2470.000000,
 	"d81ee262-e929-418a-be2b-f8c38c632611",
 	"00000000-0000-0000-0000-000000000000",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_WAY
 	VALUES ("a47214bb-8da4-4fe5-acf5-c567864b9fcb",
 	5196.000000,
-	2484.000000,
+	2470.000000,
 	"d81ee262-e929-418a-be2b-f8c38c632611",
 	"00000000-0000-0000-0000-000000000000",
 	"ea5f8537-6ab8-4755-895c-0fa34f500142");
@@ -1739,8 +1736,8 @@ INSERT INTO DIM_ND
 	0.000000,
 	"1cbf1202-c83d-458a-946d-4795453e1a47");
 INSERT INTO DIM_GE
-	VALUES (4713.000000,
-	2570.000000,
+	VALUES (4714.000000,
+	2617.000000,
 	"1cbf1202-c83d-458a-946d-4795453e1a47",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -1758,8 +1755,8 @@ INSERT INTO DIM_ND
 	0.000000,
 	"b7959105-d826-46e4-bc3c-14edf20c4d1e");
 INSERT INTO DIM_GE
-	VALUES (4671.000000,
-	2645.000000,
+	VALUES (4671.500000,
+	2668.500000,
 	"b7959105-d826-46e4-bc3c-14edf20c4d1e",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -1793,8 +1790,8 @@ INSERT INTO GD_LS
 	"e53f3b0a-bff2-4ba6-8cd7-01538a111ab3");
 INSERT INTO DIM_WAY
 	VALUES ("19db543d-88c3-4103-b3d7-f5ec81fb62a2",
-	4715.000000,
-	2569.000000,
+	4716.000000,
+	2616.000000,
 	"02e30322-3529-49f3-bbda-fc8095a8c462",
 	"00000000-0000-0000-0000-000000000000",
 	"00000000-0000-0000-0000-000000000000");
@@ -1818,6 +1815,106 @@ INSERT INTO DIM_ED
 	VALUES ("e008d171-9205-4a0e-8b56-9c60cc6b974e",
 	"9f4b1593-6049-43d2-b434-061c5f92befa",
 	"02e30322-3529-49f3-bbda-fc8095a8c462");
+INSERT INTO GD_GE
+	VALUES ("6a676a6e-d5fc-4fbb-87e6-35ff2b501748",
+	"e930d804-c1ae-49d4-a019-8f76b1959949",
+	"bc95f1bf-69a4-4013-ab97-58e1c1b23b15",
+	24,
+	0,
+	'GPS Watch::Library::Tracking::Tracking::R14');
+INSERT INTO GD_CON
+	VALUES ("6a676a6e-d5fc-4fbb-87e6-35ff2b501748",
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO GD_CTXT
+	VALUES ("fbf48dbf-5483-42c4-9e7b-f858d64003db",
+	"6a676a6e-d5fc-4fbb-87e6-35ff2b501748",
+	1,
+	0.000000,
+	0.000000);
+INSERT INTO DIM_ND
+	VALUES (0.000000,
+	0.000000,
+	"fbf48dbf-5483-42c4-9e7b-f858d64003db");
+INSERT INTO DIM_GE
+	VALUES (4955.000000,
+	2545.000000,
+	"fbf48dbf-5483-42c4-9e7b-f858d64003db",
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO DIM_ELE
+	VALUES ("fbf48dbf-5483-42c4-9e7b-f858d64003db",
+	0,
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO GD_CTXT
+	VALUES ("9780f324-016e-4a91-933e-f430c452a061",
+	"6a676a6e-d5fc-4fbb-87e6-35ff2b501748",
+	3,
+	0.000000,
+	0.000000);
+INSERT INTO DIM_ND
+	VALUES (0.000000,
+	0.000000,
+	"9780f324-016e-4a91-933e-f430c452a061");
+INSERT INTO DIM_GE
+	VALUES (5068.000000,
+	2510.000000,
+	"9780f324-016e-4a91-933e-f430c452a061",
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO DIM_ELE
+	VALUES ("9780f324-016e-4a91-933e-f430c452a061",
+	0,
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO GD_CTXT
+	VALUES ("4b640268-ba3e-4f3b-8f51-32d4bcb5470e",
+	"6a676a6e-d5fc-4fbb-87e6-35ff2b501748",
+	2,
+	0.000000,
+	0.000000);
+INSERT INTO DIM_ND
+	VALUES (0.000000,
+	0.000000,
+	"4b640268-ba3e-4f3b-8f51-32d4bcb5470e");
+INSERT INTO DIM_GE
+	VALUES (5139.000000,
+	2544.000000,
+	"4b640268-ba3e-4f3b-8f51-32d4bcb5470e",
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO DIM_ELE
+	VALUES ("4b640268-ba3e-4f3b-8f51-32d4bcb5470e",
+	0,
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO GD_LS
+	VALUES ("2643ec4b-39e9-4825-b2ac-9987f3140130",
+	"6a676a6e-d5fc-4fbb-87e6-35ff2b501748",
+	"00000000-0000-0000-0000-000000000000",
+	"ae1bbd4c-ed33-4bb0-a0de-3128b1312702",
+	"06c298a7-b009-4ecb-a839-816b362f05c4");
+INSERT INTO DIM_WAY
+	VALUES ("ae1bbd4c-ed33-4bb0-a0de-3128b1312702",
+	4957.000000,
+	2541.000000,
+	"6a676a6e-d5fc-4fbb-87e6-35ff2b501748",
+	"00000000-0000-0000-0000-000000000000",
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO DIM_WAY
+	VALUES ("06c298a7-b009-4ecb-a839-816b362f05c4",
+	5196.000000,
+	2541.000000,
+	"6a676a6e-d5fc-4fbb-87e6-35ff2b501748",
+	"00000000-0000-0000-0000-000000000000",
+	"ae1bbd4c-ed33-4bb0-a0de-3128b1312702");
+INSERT INTO DIM_GE
+	VALUES (0.000000,
+	0.000000,
+	"6a676a6e-d5fc-4fbb-87e6-35ff2b501748",
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO DIM_ELE
+	VALUES ("6a676a6e-d5fc-4fbb-87e6-35ff2b501748",
+	0,
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO DIM_ED
+	VALUES ("29140171-75ee-4860-be5b-6ca350618bd3",
+	"8f6c52e4-d842-40ad-a4a3-3fb15ed23aa7",
+	"6a676a6e-d5fc-4fbb-87e6-35ff2b501748");
 INSERT INTO DIM_DIA
 	VALUES ("e930d804-c1ae-49d4-a019-8f76b1959949",
 	'',
@@ -2544,6 +2641,55 @@ INSERT INTO PE_PE
 	"a09220a4-d685-4338-83fd-0d42f7c7e308",
 	"00000000-0000-0000-0000-000000000000",
 	9);
+INSERT INTO R_SIMP
+	VALUES ("bc95f1bf-69a4-4013-ab97-58e1c1b23b15");
+INSERT INTO R_REL
+	VALUES ("bc95f1bf-69a4-4013-ab97-58e1c1b23b15",
+	14,
+	'Represents an open achievement record, one for which a start time has been recorded
+but no end time has yet been recorded.  In other words, this association exists only
+while the currently executing goal is being achieved.',
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO R_PART
+	VALUES ("c1022670-c44d-401e-bb23-dfcef6084fba",
+	"bc95f1bf-69a4-4013-ab97-58e1c1b23b15",
+	"9bd2e282-0d41-4dc4-9e49-54af9316b174",
+	0,
+	0,
+	'is open for');
+INSERT INTO R_RTO
+	VALUES ("c1022670-c44d-401e-bb23-dfcef6084fba",
+	"bc95f1bf-69a4-4013-ab97-58e1c1b23b15",
+	"9bd2e282-0d41-4dc4-9e49-54af9316b174",
+	-1);
+INSERT INTO R_OIR
+	VALUES ("c1022670-c44d-401e-bb23-dfcef6084fba",
+	"bc95f1bf-69a4-4013-ab97-58e1c1b23b15",
+	"9bd2e282-0d41-4dc4-9e49-54af9316b174",
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO R_PART
+	VALUES ("313e48f7-0516-49bd-9401-5c67c2e55db9",
+	"bc95f1bf-69a4-4013-ab97-58e1c1b23b15",
+	"af362b48-c65b-4376-b576-1fd79da9a092",
+	0,
+	1,
+	'has open');
+INSERT INTO R_RTO
+	VALUES ("313e48f7-0516-49bd-9401-5c67c2e55db9",
+	"bc95f1bf-69a4-4013-ab97-58e1c1b23b15",
+	"af362b48-c65b-4376-b576-1fd79da9a092",
+	-1);
+INSERT INTO R_OIR
+	VALUES ("313e48f7-0516-49bd-9401-5c67c2e55db9",
+	"bc95f1bf-69a4-4013-ab97-58e1c1b23b15",
+	"af362b48-c65b-4376-b576-1fd79da9a092",
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO PE_PE
+	VALUES ("bc95f1bf-69a4-4013-ab97-58e1c1b23b15",
+	1,
+	"a09220a4-d685-4338-83fd-0d42f7c7e308",
+	"00000000-0000-0000-0000-000000000000",
+	9);
 INSERT INTO PE_PE
 	VALUES ("a09220a4-d685-4338-83fd-0d42f7c7e308",
 	1,
diff --git a/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/WorkoutSession/currentSpeed__Attribute.oal b/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/WorkoutSession/currentSpeed__Attribute.oal
deleted file mode 100644
index 09e6eb864..000000000
Binary files a/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/WorkoutSession/currentSpeed__Attribute.oal and /dev/null differ
diff --git a/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/TrackingDataTypes/TrackingDataTypes.xtuml b/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/TrackingDataTypes/TrackingDataTypes.xtuml
index a97cf2869..ea595122c 100644
--- a/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/TrackingDataTypes/TrackingDataTypes.xtuml	
+++ b/applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/TrackingDataTypes/TrackingDataTypes.xtuml	
@@ -98,6 +98,30 @@ INSERT INTO DIM_ELE
 	VALUES ("f0ceffe6-32f7-4c03-9da2-f7aaaae92b0a",
 	0,
 	"00000000-0000-0000-0000-000000000000");
+INSERT INTO GD_GE
+	VALUES ("482e08f9-2455-49fb-bf09-5bcaf3ea9dfd",
+	"8c48868c-fd80-4c09-9ff7-dd45951d216a",
+	"64809d25-628b-419f-81f2-8b99ee2e37dd",
+	109,
+	0,
+	'GPS Watch::Library::Tracking::TrackingDataTypes::GoalAchievement');
+INSERT INTO GD_SHP
+	VALUES ("482e08f9-2455-49fb-bf09-5bcaf3ea9dfd");
+INSERT INTO GD_NCS
+	VALUES ("482e08f9-2455-49fb-bf09-5bcaf3ea9dfd");
+INSERT INTO DIM_ND
+	VALUES (200.000000,
+	150.000000,
+	"482e08f9-2455-49fb-bf09-5bcaf3ea9dfd");
+INSERT INTO DIM_GE
+	VALUES (660.000000,
+	0.000000,
+	"482e08f9-2455-49fb-bf09-5bcaf3ea9dfd",
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO DIM_ELE
+	VALUES ("482e08f9-2455-49fb-bf09-5bcaf3ea9dfd",
+	0,
+	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_DIA
 	VALUES ("8c48868c-fd80-4c09-9ff7-dd45951d216a",
 	'',
@@ -116,14 +140,14 @@ INSERT INTO S_EDT
 INSERT INTO S_ENUM
 	VALUES ("5022602d-4d1a-472b-9fba-a5718549d326",
 	'HeartRate',
-	'A heart-rate criteria is specified as a range of heart rates between
+	'A heart-rate criteria is specified as a range of heart rates between
 minimum and maximum values, in beats per minute.',
 	"75257d0c-74e6-4444-9cf1-38d5d764c999",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO S_ENUM
 	VALUES ("17aba347-d92e-44cb-830a-0e8c1ff65bf0",
 	'Pace',
-	'A pace criteria is specified as a range of paces between
+	'A pace criteria is specified as a range of paces between
 miniumum and maximum values specified in minutes per kilometer.',
 	"75257d0c-74e6-4444-9cf1-38d5d764c999",
 	"5022602d-4d1a-472b-9fba-a5718549d326");
@@ -184,6 +208,31 @@ INSERT INTO PE_PE
 	"37e62abd-d1c2-4241-a4cb-9aa88fabd6e8",
 	"00000000-0000-0000-0000-000000000000",
 	10);
+INSERT INTO CNST_CSP
+	VALUES ("64809d25-628b-419f-81f2-8b99ee2e37dd",
+	'GoalAchievement',
+	'evaluationPeriod is the period, expressed in microseconds, at which goal achievement is evaluated.');
+INSERT INTO CNST_SYC
+	VALUES ("b9ab2432-db41-4bae-8435-59e7ea5fea46",
+	'evaluationPeriod',
+	'',
+	"ba5eda7a-def5-0000-0000-000000000002",
+	"64809d25-628b-419f-81f2-8b99ee2e37dd",
+	"00000000-0000-0000-0000-000000000000",
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO CNST_LFSC
+	VALUES ("b9ab2432-db41-4bae-8435-59e7ea5fea46",
+	"ba5eda7a-def5-0000-0000-000000000002");
+INSERT INTO CNST_LSC
+	VALUES ("b9ab2432-db41-4bae-8435-59e7ea5fea46",
+	"ba5eda7a-def5-0000-0000-000000000002",
+	'3000000');
+INSERT INTO PE_PE
+	VALUES ("64809d25-628b-419f-81f2-8b99ee2e37dd",
+	1,
+	"37e62abd-d1c2-4241-a4cb-9aa88fabd6e8",
+	"00000000-0000-0000-0000-000000000000",
+	10);
 INSERT INTO PE_PE
 	VALUES ("37e62abd-d1c2-4241-a4cb-9aa88fabd6e8",
 	1,