diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 7413e83..4f99569 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -89,6 +89,7 @@
     private static WifiManager wm;
     private static NetworkInfo activeNetwork;
     private static int networkStrength;
+    private static final int MAX_WIFI_LEVELS = 5;
 
     private static SimpleDateFormat df_hm;
     private static SimpleDateFormat df_full;
@@ -737,7 +738,7 @@
                                     addCellReceptionPoi();
                                     break;
                                 case Types.WIFI:
-                                    addPoi(Types.WIFI);
+                                    addWifiPoi();
                                     break;
                                 case Types.LIFT:
                                     addPoi(Types.LIFT);
@@ -932,6 +933,9 @@
         if(activeNetwork != null && activeNetwork.isConnected()){
             if(activeNetwork.getType() == ConnectivityManager.TYPE_WIFI){
                 String ssid = wm.getConnectionInfo().getSSID();
+                int levels = WifiManager.calculateSignalLevel(wm.getConnectionInfo().getRssi(), MAX_WIFI_LEVELS);
+                Log.d(TAG, "You are currently connected to '" + ssid + "' with " + levels + " (" + wm.getConnectionInfo().getRssi() + ")");
+                addPoi(Types.WIFI);
             } else {
                 Log.d(TAG, "Wifi network not available/connected");
             }