diff --git a/controllers/TracksController.php b/controllers/TracksController.php
index 0552efd..a464e10 100644
--- a/controllers/TracksController.php
+++ b/controllers/TracksController.php
@@ -95,6 +95,7 @@ class TracksController extends Controller
 		$tracks = array();
 		$latlngs = array();
 		$tracksCounter = 1;
+		$tracksCount = $tptCount = $wptCount = 0;
 
 		foreach ($gpxObject as $key => $block) {
 			if ($key == 'wpt') {
@@ -114,6 +115,8 @@ class TracksController extends Controller
 							'description' => (string) $block->desc,
 						)
 				);
+
+				$wptCount++;
 			}
 
 			if ($key == 'trk') {
@@ -150,13 +153,13 @@ class TracksController extends Controller
 
 							if ($prevPoint) {
 								$distanceTmp += Geo::distance($prevPoint, array('lat' => floatval($tpt['lat']), 'lng' => floatval($tpt['lon'])));
-//								print $distanceTmp.'<br/>';
 							}
 
 							$prevPoint = array(
 								'lat' => floatval($tpt['lat']),
 								'lng' => floatval($tpt['lon']),
 							);
+							$tptCount++;
 						}
 
 						$distance += $distanceTmp;
@@ -164,13 +167,19 @@ class TracksController extends Controller
 						$track->save();
 					}
 				}
-
+				$tracksCount++;
 			}
 		}
 
 		$trip->distance = $distance;
 		$trip->save();
 
+		$trackFile->tracksCount = $tracksCount;
+		$trackFile->tptCount = $tptCount;
+		$trackFile->wptCount = $wptCount;
+		$trackFile->distance = $distance;
+		$trackFile->save();
+
 		App::redirect('/tracks');
 	}