 			}
 
 			//Calculate surface time in minutes
-			int surfaceTime = (now() - lastDiveData->diveDateTimestamp) / 60;
+			int surfaceTime = (nowTimestamp() - lastDiveData->diveDateTimestamp) / 60;
 
 			Serial.print("Surface time (min): ");
 			Serial.println(surfaceTime);

		///////////////////////////
		// Update Last Dive Data //

		LastDiveData* lastDiveData = new LastDiveData;
		lastDiveData->diveDateTimestamp = now();
		lastDiveData->diveDate = currentTimeText;
		lastDiveData->maxDepthInMeters = diveResult->maxDepthInMeters;
		lastDiveData->durationInSeconds = diveResult->durationInSeconds;

			diveResult = buhlmann.initializeCompartments();

			lastDiveData = lastDive.loadLastDiveData();

			if (lastDiveData != NULL && lastDiveData->diveDateTimestamp > 0 ) {

			    Serial.print(F("Now timestamp: "));
			    Serial.println(nowTimestamp());
				Serial.print("Last dive timestamp: ");
				Serial.println(lastDiveData->diveDateTimestamp);

				//Calculate surface interval
				surfaceIntervalInMinutes = (nowTimestamp() - lastDiveData->diveDateTimestamp) / 60;

				Serial.print("Surface interval (min): ");
				Serial.println(surfaceIntervalInMinutes);
