diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 98567c9..6552c7a 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -439,7 +439,7 @@
 
     @Override
     public void onLocationChanged(Location location) {
-        Location oldLocation = mLocation;
+        Location oldLocation = new Location(mLocation);
         mLocation = location;
         if(mLocation == null) return;
         foundLocations.add(location);
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java
index 78aecfd..8bbcc46 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java
@@ -34,6 +34,10 @@
 import org.osmdroid.bonuspack.overlays.MapEventsOverlay;
 import org.osmdroid.bonuspack.overlays.MapEventsReceiver;
 import org.osmdroid.bonuspack.overlays.Marker;
+import org.osmdroid.bonuspack.overlays.Polyline;
+import org.osmdroid.bonuspack.routing.OSRMRoadManager;
+import org.osmdroid.bonuspack.routing.Road;
+import org.osmdroid.bonuspack.routing.RoadManager;
 import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
 import org.osmdroid.util.GeoPoint;
 import org.osmdroid.views.MapView;
@@ -340,8 +344,7 @@
                                     addWifiPoi();
                                     break;
                                 case Types.LIFT:
-                                    //TODO as in path, choose two markers
-                                    addPoi(new Lift());
+                                    addLiftMap();
                                     break;
                             }
                         }
@@ -448,6 +451,118 @@
         popupMapView.getOverlays().add(overlay);
     }
 
+    public void addLiftMap() {
+        final MapView popupMapView = new MapView(context);
+        popupMapView.setTileSource(TileSourceFactory.MAPNIK);
+        popupMapView.setBuiltInZoomControls(false);
+        popupMapView.setMultiTouchControls(true);
+        IMapController popupMapController = popupMapView.getController();
+        popupMapController.setZoom(MainActivity.ZOOM_LEVEL);
+        Location mLocation = MainActivity.getLocation();
+        popupMapController.setCenter(new GeoPoint(mLocation.getLatitude(), mLocation.getLongitude()));
+
+        List<OverlayItem> overlayItemList = new ArrayList<>();
+        for(Location l : MainActivity.getFoundLocations()){
+            OverlayItem oI = new OverlayItem(String.valueOf(l.getTime()), null, null, new GeoPoint(l.getLatitude(), l.getLongitude(), l.getAltitude()));
+            oI.setMarker(res.getDrawable(R.mipmap.ic_poi_red));
+            overlayItemList.add(oI);
+        }
+
+        List<Poi> poiMarker = dbHandler.getAllPois();
+        for(Poi p : poiMarker){
+            DbGeoPoint dbgp = p.getGp();
+            GeoPoint gp = new GeoPoint(dbgp.getLat(), dbgp.getLon(), dbgp.getAlt());
+            OverlayItem oI = new OverlayItem(String.valueOf(dbgp.getTime()), String.valueOf(p.getId()), String.valueOf(p.getType()), gp);
+            Drawable[] iconLayer = new Drawable[2];
+            iconLayer[0] = res.getDrawable(R.mipmap.ic_poi);
+            BitmapDrawable bd = (BitmapDrawable) res.getDrawable(PoiHandler.getEntryImgs()[MainActivity.getPos(p.getType())]);
+            if(bd == null) continue;
+            Bitmap b = bd.getBitmap();
+            Bitmap bResized = Bitmap.createScaledBitmap(b, b.getWidth()/2, b.getHeight()/2, false);
+            bd = new BitmapDrawable(res, bResized);
+            bd.setGravity(Gravity.CENTER_HORIZONTAL);
+            iconLayer[1] = bd;
+            LayerDrawable icon = new LayerDrawable(iconLayer);
+            oI.setMarker(icon);
+            overlayItemList.add(oI);
+        }
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        builder.setView(popupMapView)
+                .setTitle(R.string.lift_map_dialog_title)
+                .setPositiveButton(R.string.continue_button, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        ArrayList<OverlayItem> pathMarkers = MainActivity.getPathMarkers();
+
+                        RoadManager roadManager = new OSRMRoadManager(getContext());
+                        ArrayList<GeoPoint> waypoints = new ArrayList<>();
+                        DbGeoPoint current = null;
+                        DbGeoPoint last = null;
+                        for(int i=0; i<pathMarkers.size(); ++i){
+                            GeoPoint gp = (GeoPoint) pathMarkers.get(i).getPoint();
+                            waypoints.add(gp);
+                            long time = 0;
+                            long rowId = 0;
+                            String uid = pathMarkers.get(i).getUid();
+                            if(uid != null && !uid.equals("")){
+                                String[] uids = pathMarkers.get(i).getUid().split("_"); //format is 123456789_4
+                                String timeStr = uids[0];
+                                String idStr = uids[1];
+                                if(timeStr != null && !timeStr.equals("")) time = Long.parseLong(timeStr) / 1000;
+                                if(idStr != null && !idStr.equals("")) rowId = Long.parseLong(uids[1]);
+                            }
+
+                            current = new DbGeoPoint(gp.getLatitude(), gp.getLongitude(), gp.getAltitude(), time);
+                            if(pathMarkers.get(i).getTitle() == null){
+                                rowId = addGp(current);
+                            }
+                            current.setId(rowId);
+                            if(current != null && last != null){
+                                long poiId = addPoi(new Lift(0, "", last, current));
+
+                            }
+                            last = current;
+                        }
+                        Road road = roadManager.getRoad(waypoints);
+                        Polyline line = RoadManager.buildRoadOverlay(road, getContext());
+                        MainActivity.getMapView().getOverlays().add(line);
+                        MainActivity.getMapView().invalidate();
+                        MainActivity.setPathMarkers(new ArrayList<OverlayItem>());
+                    }
+                })
+                .setNegativeButton(R.string.cancel_button, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                    }
+                });
+        AlertDialog pathMapDialog = builder.create();
+        pathMapDialog.show();
+        pathMapDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+        final MapDialogItemizedIconOverlay overlay = new MapDialogItemizedIconOverlay(context, overlayItemList, pathMapDialog, popupMapView);
+
+        MapEventsReceiver eventsReceiver = new MapEventsReceiver() {
+            @Override
+            public boolean singleTapConfirmedHelper(GeoPoint geoPoint) {
+                return false;
+            }
+
+            @Override
+            public boolean longPressHelper(GeoPoint geoPoint) {
+                Vibrator v = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
+                v.vibrate(VIB_LENGTH);
+                OverlayItem oI = new OverlayItem("", null, null, geoPoint);
+                oI.setMarker(context.getResources().getDrawable(R.mipmap.ic_poi_red));
+                overlay.addItem(oI);
+                popupMapView.invalidate();
+                return true;
+            }
+        };
+
+        popupMapView.getOverlays().add(new MapEventsOverlay(context, eventsReceiver));
+        popupMapView.getOverlays().add(overlay);
+    }
+
     public void addImageMap() {
         final MapView popupMapView = new MapView(context);
         popupMapView.setTileSource(TileSourceFactory.MAPNIK);
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 8cbef8b..81101d9 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -12,6 +12,7 @@
     <string name="path_map_remove_marker_dialog_title">Marker löschen?</string>
     <string name="path_map_remove_marker_dialog_text">Möchtest du diesen Marker wirklich von der Karte löschen?</string>
     <string name="image_map_dialog_title">Wähle ein POI aus, zu dem du ein Bild hinzufügen möchtest</string>
+    <string name="lift_map_dialog_title">Wähle den Start- und End-Punkt des Lifts aus</string>
     <string name="ok_button_remove_marker">Löschen</string>
     <string name="cancel_button_remove_marker">Nicht löschen</string>
     <string name="break_point_dialog_title">Art des Pausenorts</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 13b6db8..8bb6344 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,6 +13,7 @@
     <string name="path_map_remove_marker_dialog_title">Remove marker?</string>
     <string name="path_map_remove_marker_dialog_text">Do you really want to remove this marker from the map?</string>
     <string name="image_map_dialog_title">Choose a POI, to which you want to add a picture</string>
+    <string name="lift_map_dialog_title">Select the start and end point of your lift</string>
     <string name="ok_button_remove_marker">Remove</string>
     <string name="cancel_button_remove_marker">Don\'t remove</string>
     <string name="break_point_dialog_title">Kind of the break point</string>