diff --git a/The Race App/Pins@2x/PinNumber10@2x.png b/The Race App/Pins@2x/PinNumber10@2x.png
new file mode 100644
index 0000000..5e1f560
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber10@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber11@2x.png b/The Race App/Pins@2x/PinNumber11@2x.png
new file mode 100644
index 0000000..1c56f99
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber11@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber12@2x.png b/The Race App/Pins@2x/PinNumber12@2x.png
new file mode 100644
index 0000000..39a6946
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber12@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber13@2x.png b/The Race App/Pins@2x/PinNumber13@2x.png
new file mode 100644
index 0000000..e57a007
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber13@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber14@2x.png b/The Race App/Pins@2x/PinNumber14@2x.png
new file mode 100644
index 0000000..0808186
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber14@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber15@2x.png b/The Race App/Pins@2x/PinNumber15@2x.png
new file mode 100644
index 0000000..002cad0
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber15@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber16@2x.png b/The Race App/Pins@2x/PinNumber16@2x.png
new file mode 100644
index 0000000..784b5c5
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber16@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber17@2x.png b/The Race App/Pins@2x/PinNumber17@2x.png
new file mode 100644
index 0000000..f53d722
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber17@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber18@2x.png b/The Race App/Pins@2x/PinNumber18@2x.png
new file mode 100644
index 0000000..ec1eb2a
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber18@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber19@2x.png b/The Race App/Pins@2x/PinNumber19@2x.png
new file mode 100644
index 0000000..bd3baa6
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber19@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber1@2x.png b/The Race App/Pins@2x/PinNumber1@2x.png
new file mode 100644
index 0000000..2186924
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber1@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber20@2x.png b/The Race App/Pins@2x/PinNumber20@2x.png
new file mode 100644
index 0000000..3fdaa67
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber20@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber21@2x.png b/The Race App/Pins@2x/PinNumber21@2x.png
new file mode 100644
index 0000000..6506cd1
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber21@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber22@2x.png b/The Race App/Pins@2x/PinNumber22@2x.png
new file mode 100644
index 0000000..24f5e67
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber22@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber23@2x.png b/The Race App/Pins@2x/PinNumber23@2x.png
new file mode 100644
index 0000000..54772d4
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber23@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber24@2x.png b/The Race App/Pins@2x/PinNumber24@2x.png
new file mode 100644
index 0000000..2dcc3e9
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber24@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber25@2x.png b/The Race App/Pins@2x/PinNumber25@2x.png
new file mode 100644
index 0000000..a5166ba
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber25@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber2@2x.png b/The Race App/Pins@2x/PinNumber2@2x.png
new file mode 100644
index 0000000..39ddb10
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber2@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber3@2x.png b/The Race App/Pins@2x/PinNumber3@2x.png
new file mode 100644
index 0000000..cd9401a
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber3@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber4@2x.png b/The Race App/Pins@2x/PinNumber4@2x.png
new file mode 100644
index 0000000..54b7105
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber4@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber5@2x.png b/The Race App/Pins@2x/PinNumber5@2x.png
new file mode 100644
index 0000000..8f94a80
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber5@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber6@2x.png b/The Race App/Pins@2x/PinNumber6@2x.png
new file mode 100644
index 0000000..d302914
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber6@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber7@2x.png b/The Race App/Pins@2x/PinNumber7@2x.png
new file mode 100644
index 0000000..ff76e7a
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber7@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber8@2x.png b/The Race App/Pins@2x/PinNumber8@2x.png
new file mode 100644
index 0000000..d9607a9
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber8@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumber9@2x.png b/The Race App/Pins@2x/PinNumber9@2x.png
new file mode 100644
index 0000000..1f509ad
Binary files /dev/null and b/The Race App/Pins@2x/PinNumber9@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen10@2x.png b/The Race App/Pins@2x/PinNumberGreen10@2x.png
new file mode 100644
index 0000000..fa5db21
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen10@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen11@2x.png b/The Race App/Pins@2x/PinNumberGreen11@2x.png
new file mode 100644
index 0000000..4ee8388
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen11@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen12@2x.png b/The Race App/Pins@2x/PinNumberGreen12@2x.png
new file mode 100644
index 0000000..8f4b62d
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen12@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen13@2x.png b/The Race App/Pins@2x/PinNumberGreen13@2x.png
new file mode 100644
index 0000000..9a333d1
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen13@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen14@2x.png b/The Race App/Pins@2x/PinNumberGreen14@2x.png
new file mode 100644
index 0000000..78a97a6
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen14@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen15@2x.png b/The Race App/Pins@2x/PinNumberGreen15@2x.png
new file mode 100644
index 0000000..420ffba
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen15@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen16@2x.png b/The Race App/Pins@2x/PinNumberGreen16@2x.png
new file mode 100644
index 0000000..2b1e6eb
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen16@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen17@2x.png b/The Race App/Pins@2x/PinNumberGreen17@2x.png
new file mode 100644
index 0000000..3c819dc
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen17@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen18@2x.png b/The Race App/Pins@2x/PinNumberGreen18@2x.png
new file mode 100644
index 0000000..e1596f9
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen18@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen19@2x.png b/The Race App/Pins@2x/PinNumberGreen19@2x.png
new file mode 100644
index 0000000..2695c99
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen19@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen1@2x.png b/The Race App/Pins@2x/PinNumberGreen1@2x.png
new file mode 100644
index 0000000..d17fad7
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen1@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen20@2x.png b/The Race App/Pins@2x/PinNumberGreen20@2x.png
new file mode 100644
index 0000000..199f543
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen20@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen21@2x.png b/The Race App/Pins@2x/PinNumberGreen21@2x.png
new file mode 100644
index 0000000..1278b01
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen21@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen22@2x.png b/The Race App/Pins@2x/PinNumberGreen22@2x.png
new file mode 100644
index 0000000..849d8a2
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen22@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen23@2x.png b/The Race App/Pins@2x/PinNumberGreen23@2x.png
new file mode 100644
index 0000000..4c380f4
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen23@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen24@2x.png b/The Race App/Pins@2x/PinNumberGreen24@2x.png
new file mode 100644
index 0000000..53c11b5
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen24@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen25@2x.png b/The Race App/Pins@2x/PinNumberGreen25@2x.png
new file mode 100644
index 0000000..916f0b2
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen25@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen3@2x.png b/The Race App/Pins@2x/PinNumberGreen3@2x.png
new file mode 100644
index 0000000..fecf481
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen3@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen4@2x.png b/The Race App/Pins@2x/PinNumberGreen4@2x.png
new file mode 100644
index 0000000..23711f5
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen4@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen5@2x.png b/The Race App/Pins@2x/PinNumberGreen5@2x.png
new file mode 100644
index 0000000..b92bb1b
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen5@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen6@2x.png b/The Race App/Pins@2x/PinNumberGreen6@2x.png
new file mode 100644
index 0000000..41b5ba9
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen6@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen7@2x.png b/The Race App/Pins@2x/PinNumberGreen7@2x.png
new file mode 100644
index 0000000..6ad4174
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen7@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen8@2x.png b/The Race App/Pins@2x/PinNumberGreen8@2x.png
new file mode 100644
index 0000000..1832c30
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen8@2x.png differ
diff --git a/The Race App/Pins@2x/PinNumberGreen9@2x.png b/The Race App/Pins@2x/PinNumberGreen9@2x.png
new file mode 100644
index 0000000..597c90f
Binary files /dev/null and b/The Race App/Pins@2x/PinNumberGreen9@2x.png differ
diff --git a/The Race App/RaceViewController.m b/The Race App/RaceViewController.m
index 4a0cc5c..8cea740 100644
--- a/The Race App/RaceViewController.m	
+++ b/The Race App/RaceViewController.m	
@@ -11,6 +11,8 @@
 #import "TraceOverlayView.h"
 #import "GPSTracePlayer.h"
 
+#define kPinNumberTag 343
+
 @interface RaceViewController ()
 
 @property(nonatomic, retain) Trace             * currentTrace;
@@ -136,6 +138,8 @@ - (void)raceTracer:(RaceTracer *)tracer reachedCheckpointAtIndex:(NSUInteger)che
 	MKPinAnnotationView * checkPointPinView = (MKPinAnnotationView *)[mapView viewForAnnotation:startAnnotation];
 	
 	checkPointPinView.pinColor = MKPinAnnotationColorGreen;
+    UIImageView *imgView = (UIImageView*)[checkPointPinView viewWithTag:kPinNumberTag];
+    [imgView setImage:[UIImage imageNamed:[NSString stringWithFormat:@"PinNumberGreen%d.png", checkpointReachedIdx+1]]];
 }
 
 - (void)raceTracerReachedStartPoint:(RaceTracer *)tracer;
@@ -144,6 +148,8 @@ - (void)raceTracerReachedStartPoint:(RaceTracer *)tracer;
 	MKPinAnnotationView * checkPointPinView = (MKPinAnnotationView *)[mapView viewForAnnotation:startAnnotation];
 	
 	checkPointPinView.pinColor = MKPinAnnotationColorGreen;
+    UIImageView *imgView = (UIImageView*)[checkPointPinView viewWithTag:kPinNumberTag];
+    [imgView setImage:[UIImage imageNamed:@"PinNumberGreen1.png"]];
 	
 	[UIView animateWithDuration:1
 					 animations:^{
@@ -233,6 +239,14 @@ - (MKAnnotationView *)mapView:(MKMapView *)theMapView viewForAnnotation:(id<MKAn
 	MKPinAnnotationView *checkpointView = (MKPinAnnotationView*)[mapView dequeueReusableAnnotationViewWithIdentifier:checkpointViewIdentifier];
 	if (!checkpointView) {
 		checkpointView = [[[MKPinAnnotationView alloc] initWithAnnotation:annotation reuseIdentifier:checkpointViewIdentifier] autorelease];
+        
+        NSUInteger index = [checkpoints indexOfObject:annotation];
+        
+        UIImageView *image = [[UIImageView alloc] initWithImage:[UIImage imageNamed:[NSString stringWithFormat:@"PinNumber%d.png", index+1]]];
+        [image setFrame:CGRectMake(-1, -1, 17, 17)];
+        [image setTag:kPinNumberTag];
+        [checkpointView addSubview:image];
+        [image release];
 		checkpointView.pinColor = MKPinAnnotationColorRed;
 		checkpointView.animatesDrop = YES;
 	}
diff --git a/The Race App/TrackCreatorViewController.m b/The Race App/TrackCreatorViewController.m
index 6b522d6..06cb79f 100644
--- a/The Race App/TrackCreatorViewController.m	
+++ b/The Race App/TrackCreatorViewController.m	
@@ -73,8 +73,16 @@ - (void)saveTrack:(id)sender {
 																otherButtonTitles:nil] autorelease];
 		[errorAlert show];
 		return;
+    } else  if ([self.coordinates count]>25) {
+        UIAlertView *errorAlert = [[[UIAlertView alloc] initWithTitle:@"Too much checkpoints!" 
+                                                              message:@"Please remove some checkpoints. The maximum number of checkpoints is 25"
+                                                             delegate:nil
+                                                    cancelButtonTitle:@"Dismiss"
+                                                    otherButtonTitles:nil] autorelease];
+		[errorAlert show];
+		return;
     } else {
-        //Save track and pass it on to some object.
+        //Save track and pass it on to the server
         NSMutableArray *locationArray = [[NSMutableArray alloc] init];
         for (int i = 0; i<[self.coordinates count]; i++) {
             DDAnnotation *ann = [self.coordinates objectAtIndex:i];