diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1d5c4487..f4e209d6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <uses-sdk
             android:minSdkVersion="14"
@@ -32,6 +33,16 @@
         <activity
                 android:name=".Preferences"
                 android:label="@string/preferences"/>
+        <receiver
+                android:name=".BootReceiver"
+                android:enabled="true"
+                android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="org.blitzortung.android.app" />
+            </intent-filter>
+        </receiver>
         <!--<receiver android:name=".WidgetProvider">
             <meta-data android:name="android.appwidget.provider"
                        android:resource="@xml/widget_provider" />
diff --git a/doc/README.txt b/doc/README.txt
index cb049a3b..caa9a695 100644
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -1,4 +1,4 @@
 upcoming features:
 
 * animation
-* background task and close activity alarm
\ No newline at end of file
+* background task and close context alarm
\ No newline at end of file
diff --git a/src/main/java/org/blitzortung/android/alarm/AlarmManager.java b/src/main/java/org/blitzortung/android/alarm/AlertManager.java
similarity index 86%
rename from src/main/java/org/blitzortung/android/alarm/AlarmManager.java
rename to src/main/java/org/blitzortung/android/alarm/AlertManager.java
index 09421e4f..e4dc3cbb 100644
--- a/src/main/java/org/blitzortung/android/alarm/AlarmManager.java
+++ b/src/main/java/org/blitzortung/android/alarm/AlertManager.java
@@ -11,6 +11,7 @@
 import android.util.Log;
 import org.blitzortung.android.alarm.factory.AlarmObjectFactory;
 import org.blitzortung.android.alarm.handler.AlarmStatusHandler;
+import org.blitzortung.android.alarm.listener.AlertListener;
 import org.blitzortung.android.alarm.object.AlarmSector;
 import org.blitzortung.android.alarm.object.AlarmStatus;
 import org.blitzortung.android.app.Main;
@@ -25,7 +26,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-public class AlarmManager implements OnSharedPreferenceChangeListener, LocationHandler.Listener {
+public class AlertManager implements OnSharedPreferenceChangeListener, LocationHandler.Listener {
 
     private final Vibrator vibrator;
     private final NotificationHandler notificationHandler;
@@ -39,12 +40,6 @@ public void updateContext(Context context) {
         alarmParameters.updateSectorLabels(context);
     }
 
-    public interface AlarmListener {
-        void onAlarmResult(AlarmResult alarmResult);
-
-        void onAlarmClear();
-    }
-
     private final AlarmParameters alarmParameters;
 
     private Location location;
@@ -53,8 +48,7 @@ public interface AlarmListener {
 
     private boolean alarmValid;
 
-    // VisibleForTesting
-    protected final Set<AlarmListener> alarmListeners;
+    private AlertListener alertListener;
 
     private final AlarmStatus alarmStatus;
 
@@ -70,7 +64,7 @@ public interface AlarmListener {
 
     private long signalingLastTimestamp;
 
-    public AlarmManager(LocationHandler locationHandler, SharedPreferences preferences, Context context, Vibrator vibrator, NotificationHandler notificationHandler, AlarmObjectFactory alarmObjectFactory, AlarmParameters alarmParameters) {
+    public AlertManager(LocationHandler locationHandler, SharedPreferences preferences, Context context, Vibrator vibrator, NotificationHandler notificationHandler, AlarmObjectFactory alarmObjectFactory, AlarmParameters alarmParameters) {
         this.locationHandler = locationHandler;
         this.context = context;
         this.vibrator = vibrator;
@@ -80,8 +74,6 @@ public AlarmManager(LocationHandler locationHandler, SharedPreferences preferenc
         this.alarmParameters = alarmParameters;
 
 
-        alarmListeners = new HashSet<AlarmListener>();
-
         preferences.registerOnSharedPreferenceChangeListener(this);
         onSharedPreferenceChanged(preferences, PreferenceKey.ALARM_ENABLED);
         onSharedPreferenceChanged(preferences, PreferenceKey.MEASUREMENT_UNIT);
@@ -140,16 +132,16 @@ private void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Pref
     public void onLocationChanged(Location location) {
         this.location = location;
 
-        checkStrokes(lastStrokes, true);
+        checkStrokes(lastStrokes);
     }
 
     public boolean isAlarmEnabled() {
         return alarmEnabled;
     }
 
-    public void checkStrokes(Collection<? extends Stroke> strokes, boolean strokesAreInRealtime) {
-        boolean currentAlarmIsValid = isAlarmEnabled() && location != null && strokes != null && strokesAreInRealtime;
-        lastStrokes = strokesAreInRealtime ? strokes : null;
+    public void checkStrokes(Collection<? extends Stroke> strokes) {
+        boolean currentAlarmIsValid = isAlarmEnabled() && location != null && strokes != null;
+        lastStrokes = strokes;
 
         if (currentAlarmIsValid) {
             alarmValid = true;
@@ -168,20 +160,8 @@ public String getTextMessage(float notificationDistanceLimit) {
         return alarmStatusHandler.getTextMessage(alarmStatus, notificationDistanceLimit);
     }
 
-    public void addAlarmListener(AlarmListener alarmListener) {
-        alarmListeners.add(alarmListener);
-    }
-
-    public Set<AlarmListener> getAlarmListeners() {
-        return alarmListeners;
-    }
-
-    public void clearAlarmListeners() {
-        alarmListeners.clear();
-    }
-
-    public void removeAlarmListener(AlarmListener alarmView) {
-        alarmListeners.remove(alarmView);
+    public void setAlertListener(AlertListener alertListener) {
+        this.alertListener = alertListener;
     }
 
     public Collection<AlarmSector> getAlarmSectors() {
@@ -212,25 +192,25 @@ private void invalidateAlarm() {
     }
 
     private void broadcastClear() {
-        for (AlarmListener alarmListener : alarmListeners) {
-            alarmListener.onAlarmClear();
+        if (alertListener != null) {
+            alertListener.onAlertCancel();
         }
     }
 
     private void broadcastResult(AlarmResult alarmResult) {
-        for (AlarmListener alarmListener : alarmListeners) {
-            alarmListener.onAlarmResult(alarmResult);
+        if (alertListener != null) {
+            alertListener.onAlert(alarmStatus, alarmResult);
         }
     }
 
     private void processResult(AlarmResult alarmResult) {
         if (alarmResult != null) {
-            Log.v(Main.LOG_TAG, "AlarmManager.processResult()");
+            Log.v(Main.LOG_TAG, "AlertManager.processResult()");
 
             if (alarmResult.getClosestStrokeDistance() <= signalingDistanceLimit) {
                 long signalingLatestTimestamp = alarmStatusHandler.getLatestTimstampWithin(signalingDistanceLimit, alarmStatus);
                 if (signalingLatestTimestamp > signalingLastTimestamp) {
-                    Log.v(Main.LOG_TAG, "AlarmManager.processResult() perform alarm");
+                    Log.v(Main.LOG_TAG, "AlertManager.processResult() perform alarm");
                     vibrateIfEnabled();
                     playSoundIfEnabled();
                     signalingLastTimestamp = signalingLatestTimestamp;
@@ -242,7 +222,7 @@ private void processResult(AlarmResult alarmResult) {
             if (alarmResult.getClosestStrokeDistance() <= notificationDistanceLimit) {
                 long notificationLatestTimestamp = alarmStatusHandler.getLatestTimstampWithin(notificationDistanceLimit, alarmStatus);
                 if (notificationLatestTimestamp > notificationLastTimestamp) {
-                    Log.v(Main.LOG_TAG, "AlarmManager.processResult() perform notification");
+                    Log.v(Main.LOG_TAG, "AlertManager.processResult() perform notification");
                     notificationHandler.sendNotification(context.getResources().getString(R.string.activity) + ": " + getTextMessage(notificationDistanceLimit));
                     notificationLastTimestamp = notificationLatestTimestamp;
                 } else {
@@ -255,7 +235,7 @@ private void processResult(AlarmResult alarmResult) {
             notificationHandler.clearNotification();
         }
 
-        Log.v(Main.LOG_TAG, String.format("AlarmManager.processResult() broadcast result %s", alarmResult));
+        Log.v(Main.LOG_TAG, String.format("AlertManager.processResult() broadcast result %s", alarmResult));
 
         broadcastResult(alarmResult);
     }
@@ -277,4 +257,7 @@ public Location getCurrentLocation() {
         return location;
     }
 
+    public void cancelAlert() {
+        broadcastClear();
+    }
 }
diff --git a/src/main/java/org/blitzortung/android/alarm/listener/AlertListener.java b/src/main/java/org/blitzortung/android/alarm/listener/AlertListener.java
new file mode 100644
index 00000000..f11f36aa
--- /dev/null
+++ b/src/main/java/org/blitzortung/android/alarm/listener/AlertListener.java
@@ -0,0 +1,11 @@
+package org.blitzortung.android.alarm.listener;
+
+import org.blitzortung.android.alarm.AlarmParameters;
+import org.blitzortung.android.alarm.AlarmResult;
+import org.blitzortung.android.alarm.object.AlarmStatus;
+
+public interface AlertListener {
+    void onAlert(AlarmStatus alarmStatus, AlarmResult alarmResult);
+
+    void onAlertCancel();
+}
diff --git a/src/main/java/org/blitzortung/android/alarm/object/AlarmStatus.java b/src/main/java/org/blitzortung/android/alarm/object/AlarmStatus.java
index a09bd389..9d21d02b 100644
--- a/src/main/java/org/blitzortung/android/alarm/object/AlarmStatus.java
+++ b/src/main/java/org/blitzortung/android/alarm/object/AlarmStatus.java
@@ -9,8 +9,10 @@
 public class AlarmStatus {
 
     private final Collection<AlarmSector> sectors;
+    private final AlarmParameters alarmParameters;
 
     public AlarmStatus(AlarmObjectFactory alarmObjectFactory, AlarmParameters alarmParameters) {
+        this.alarmParameters = alarmParameters;
         final String[] sectorLabels = alarmParameters.getSectorLabels();
         float sectorWidth = 360f / sectorLabels.length;
         
@@ -36,4 +38,8 @@ public void clearResults() {
     public Collection<AlarmSector> getSectors() {
         return sectors;
     }
+
+    public AlarmParameters getAlarmParameters() {
+        return alarmParameters;
+    }
 }
diff --git a/src/main/java/org/blitzortung/android/app/AppService.java b/src/main/java/org/blitzortung/android/app/AppService.java
index 6140130d..3f294a36 100644
--- a/src/main/java/org/blitzortung/android/app/AppService.java
+++ b/src/main/java/org/blitzortung/android/app/AppService.java
@@ -8,21 +8,29 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.os.Binder;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.PowerManager;
+import android.location.Location;
+import android.os.*;
 import android.preference.PreferenceManager;
 import android.util.Log;
+import org.blitzortung.android.alarm.AlarmParameters;
+import org.blitzortung.android.alarm.AlarmResult;
+import org.blitzortung.android.alarm.AlertManager;
+import org.blitzortung.android.alarm.factory.AlarmObjectFactory;
+import org.blitzortung.android.alarm.listener.AlertListener;
+import org.blitzortung.android.alarm.object.AlarmStatus;
+import org.blitzortung.android.app.controller.LocationHandler;
+import org.blitzortung.android.app.controller.NotificationHandler;
 import org.blitzortung.android.app.view.PreferenceKey;
 import org.blitzortung.android.data.DataChannel;
 import org.blitzortung.android.data.DataHandler;
+import org.blitzortung.android.data.DataListener;
+import org.blitzortung.android.data.provider.DataResult;
 import org.blitzortung.android.util.Period;
 
 import java.util.HashSet;
 import java.util.Set;
 
-public class AppService extends Service implements Runnable, SharedPreferences.OnSharedPreferenceChangeListener {
+public class AppService extends Service implements Runnable, SharedPreferences.OnSharedPreferenceChangeListener, DataListener, LocationHandler.Listener {
 
     public static final String RETRIEVE_DATA_ACTION = "retrieveData";
 
@@ -55,6 +63,10 @@ public class AppService extends Service implements Runnable, SharedPreferences.O
     private PendingIntent pendingIntent;
 
     private PowerManager.WakeLock wakeLock;
+    private LocationHandler locationHandler;
+    private AlertManager alertManager;
+    private DataListener dataListener;
+    private LocationHandler.Listener locationListener;
 
     @SuppressWarnings("UnusedDeclaration")
     public AppService() {
@@ -66,6 +78,7 @@ protected AppService(Handler handler, Period updatePeriod) {
         Log.d(Main.LOG_TAG, "AppService() create");
         this.handler = handler;
         this.updatePeriod = updatePeriod;
+        backgroundOperation = true;
     }
 
     public int getPeriod() {
@@ -98,6 +111,77 @@ public DataHandler getDataHandler() {
         return dataHandler;
     }
 
+    public boolean isAlarmEnabled() {
+        return alertManager.isAlarmEnabled();
+    }
+
+    public AlarmResult getAlarmResult() {
+        return alertManager.getAlarmResult();
+    }
+
+    public AlertManager getAlertManager() {
+        return alertManager;
+    }
+
+    @Override
+    public void onBeforeDataUpdate() {
+        if (dataListener != null) {
+            dataListener.onBeforeDataUpdate();
+        }
+    }
+
+    @Override
+    public void onDataUpdate(DataResult result) {
+        if (!result.isBackground() && dataListener != null) {
+            dataListener.onDataUpdate(result);
+        }
+
+        if (result.containsRealtimeData()) {
+            alertManager.checkStrokes(result.getStrokes());
+        } else {
+            alertManager.cancelAlert();
+        }
+
+        releaseWakeLock();
+    }
+
+    @Override
+    public void onDataReset() {
+
+    }
+
+    @Override
+    public void onDataError() {
+
+    }
+
+    public void setDataListener(DataListener dataListener) {
+        this.dataListener = dataListener;
+    }
+
+    public void setAlertListener(AlertListener alertListener) {
+        alertManager.setAlertListener(alertListener);
+    }
+
+    public AlarmStatus getAlarmStatus() {
+        return alertManager.getAlarmStatus();
+    }
+
+    public void clearLocationListener() {
+        locationListener = null;
+    }
+
+    public void setLocationListener(LocationHandler.Listener locationListener) {
+        this.locationListener = locationListener;
+    }
+
+    @Override
+    public void onLocationChanged(Location location) {
+        if (locationListener != null) {
+            locationListener.onLocationChanged(location);
+        }
+    }
+
     public class DataServiceBinder extends Binder {
         AppService getService() {
             Log.d(Main.LOG_TAG, "DataServiceBinder.getService() " + AppService.this);
@@ -126,7 +210,17 @@ public void onCreate() {
 
         if (dataHandler == null) {
             dataHandler = new DataHandler(preferences, getPackageInfo());
+            dataHandler.setDataListener(this);
         }
+
+        locationHandler = new LocationHandler(this, preferences);
+        locationHandler.requestUpdates(this);
+        AlarmParameters alarmParameters = new AlarmParameters();
+        alarmParameters.updateSectorLabels(this);
+        alertManager = new AlertManager(locationHandler, preferences, this,
+                (Vibrator) this.getSystemService(Context.VIBRATOR_SERVICE),
+                new NotificationHandler(this),
+                new AlarmObjectFactory(), alarmParameters);
     }
 
     @Override
@@ -134,22 +228,27 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         Log.i(Main.LOG_TAG, "AppService.onStartCommand() startId: " + startId + " " + intent);
 
         if (intent != null && RETRIEVE_DATA_ACTION.equals(intent.getAction())) {
-            if (!backgroundOperation) {
-                Log.i(Main.LOG_TAG, "AppService.onStartCommand() discard alarm");
-                discardAlarm();
-            } else {
+            if (backgroundOperation) {
                 releaseWakeLock();
                 Log.i(Main.LOG_TAG, "AppService.onStartCommand() wakeLock released");
 
                 PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
                 wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKE_LOCK_TAG);
-                wakeLock.acquire();
+                wakeLock.acquire(10000);
 
                 Log.v(Main.LOG_TAG, "AppService.onStartCommand() acquire wake lock " + wakeLock);
 
                 handler.removeCallbacks(this);
                 handler.post(this);
             }
+        } else {
+            if (backgroundOperation) {
+                if (alarmManager == null && backgroundPeriod > 0) {
+                    createAlarm();
+                }
+            } else {
+                discardAlarm();
+            }
         }
 
         return START_STICKY;
@@ -170,6 +269,9 @@ public void releaseWakeLock() {
     @Override
     public IBinder onBind(Intent intent) {
         Log.i(Main.LOG_TAG, "AppService.onBind() " + intent);
+
+        backgroundOperation = false;
+
         return binder;
     }
 
@@ -236,7 +338,7 @@ public boolean onPause() {
         handler.removeCallbacks(this);
         Log.v(Main.LOG_TAG, "AppService.onPause() remove callback");
 
-        if (alarmEnabled && backgroundPeriod != 0) {
+        if (alarmEnabled && backgroundPeriod > 0) {
             createAlarm();
             return false;
         }
diff --git a/src/main/java/org/blitzortung/android/app/BootReceiver.java b/src/main/java/org/blitzortung/android/app/BootReceiver.java
new file mode 100644
index 00000000..818ce3d2
--- /dev/null
+++ b/src/main/java/org/blitzortung/android/app/BootReceiver.java
@@ -0,0 +1,14 @@
+package org.blitzortung.android.app;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class BootReceiver extends BroadcastReceiver{
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Intent bootIntent = new Intent(context, AppService.class);
+        bootIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startService(bootIntent);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/blitzortung/android/app/Main.java b/src/main/java/org/blitzortung/android/app/Main.java
index 1a6537ad..a58143ca 100644
--- a/src/main/java/org/blitzortung/android/app/Main.java
+++ b/src/main/java/org/blitzortung/android/app/Main.java
@@ -9,6 +9,7 @@
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.location.Location;
+import android.location.LocationListener;
 import android.os.*;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
@@ -20,8 +21,10 @@
 import com.google.android.maps.GeoPoint;
 import com.google.android.maps.MapController;
 import org.blitzortung.android.alarm.AlarmLabelHandler;
-import org.blitzortung.android.alarm.AlarmManager;
+import org.blitzortung.android.alarm.AlertManager;
 import org.blitzortung.android.alarm.AlarmResult;
+import org.blitzortung.android.alarm.listener.AlertListener;
+import org.blitzortung.android.alarm.object.AlarmStatus;
 import org.blitzortung.android.app.controller.ButtonColumnHandler;
 import org.blitzortung.android.app.controller.HistoryController;
 import org.blitzortung.android.app.controller.LocationHandler;
@@ -47,7 +50,7 @@
 import java.util.Set;
 
 public class Main extends OwnMapActivity implements DataListener, OnSharedPreferenceChangeListener, AppService.DataServiceStatusListener,
-        AlarmManager.AlarmListener {
+        AlertListener, LocationHandler.Listener {
 
     public static final String LOG_TAG = "BO_ANDROID";
 
@@ -59,10 +62,6 @@ public class Main extends OwnMapActivity implements DataListener, OnSharedPrefer
 
     private ParticipantsOverlay participantsOverlay;
 
-    private AlarmManager alarmManager;
-
-    private LocationHandler locationHandler;
-
     private OwnLocationOverlay ownLocationOverlay;
 
     private Persistor persistor;
@@ -113,7 +112,6 @@ public void onCreate(Bundle savedInstanceState) {
         }
         persistor.updateContext(this);
 
-        locationHandler = persistor.getLocationHandler();
         strokesOverlay = persistor.getStrokesOverlay();
         participantsOverlay = persistor.getParticipantsOverlay();
 
@@ -128,19 +126,13 @@ public void onZoom(int zoomLevel) {
         });
 
         fadeOverlay = new FadeOverlay(strokesOverlay.getColorHandler());
-        ownLocationOverlay = new OwnLocationOverlay(getBaseContext(), persistor.getLocationHandler(), getMapView());
+        ownLocationOverlay = new OwnLocationOverlay(getBaseContext(), getMapView());
 
         addOverlays(fadeOverlay, strokesOverlay, participantsOverlay, ownLocationOverlay);
 
         statusComponent = new StatusComponent(this);
         setHistoricStatusString();
 
-        alarmManager = persistor.getAlarmManager();
-
-        if (alarmManager.isAlarmEnabled()) {
-            onAlarmResult(alarmManager.getAlarmResult());
-        }
-
         buttonColumnHandler = new ButtonColumnHandler<ImageButton>();
 
         if (Build.VERSION.SDK_INT >= 14) {
@@ -195,11 +187,18 @@ public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
                 appService = ((AppService.DataServiceBinder) iBinder).getService();
                 Log.i(Main.LOG_TAG, "Main.ServiceConnection.onServiceConnected() " + appService);
                 appService.setStatusListener(Main.this);
-                appService.getDataHandler().setDataListener(Main.this);
+                appService.setDataListener(Main.this);
+                appService.setAlertListener(Main.this);
+                appService.setLocationListener(Main.this);
+
                 strokesOverlay.setIntervalDuration(appService.getDataHandler().getIntervalDuration());
                 if (!persistor.hasCurrentResult()) {
                     appService.restart();
                 }
+                if (appService.isAlarmEnabled()) {
+                    onAlert(appService.getAlarmStatus(), appService.getAlarmResult());
+                }
+
                 appService.onResume();
                 historyController.setAppService(appService);
             }
@@ -245,19 +244,19 @@ public void onClick(View v) {
         });
 
         alarmView = (AlarmView) findViewById(R.id.alarm_view);
-        alarmView.setAlarmManager(alarmManager);
         alarmView.setColorHandler(strokesOverlay.getColorHandler(), strokesOverlay.getIntervalDuration());
         alarmView.setBackgroundColor(Color.TRANSPARENT);
         alarmView.setAlpha(200);
         alarmView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (alarmManager.isAlarmEnabled()) {
-                    final Location currentLocation = alarmManager.getCurrentLocation();
+                final AlertManager alertManager = appService.getAlertManager();
+                if (alertManager != null && alertManager.isAlarmEnabled()) {
+                    final Location currentLocation = alertManager.getCurrentLocation();
                     if (currentLocation != null) {
-                        float radius = alarmManager.getMaxDistance();
+                        float radius = alertManager.getMaxDistance();
 
-                        final AlarmResult alarmResult = alarmManager.getAlarmResult();
+                        final AlarmResult alarmResult = alertManager.getAlarmResult();
                         if (alarmResult != null) {
                             radius = Math.max(Math.min(alarmResult.getClosestStrokeDistance() * 1.2f, radius), 50f);
                         }
@@ -392,7 +391,6 @@ public void onResume() {
         if (appService != null) {
             appService.onResume();
         }
-        locationHandler.onResume();
 
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
         if (preferences.getBoolean(PreferenceKey.SHOW_LOCATION.toString(), false)) {
@@ -404,16 +402,15 @@ public void onResume() {
     public void onPause() {
         super.onPause();
 
-        if (appService == null || appService.onPause()) {
-            Log.d(Main.LOG_TAG, "Main.onPause() disable location handler");
-            locationHandler.onPause();
-        } else {
-            Log.d(Main.LOG_TAG, "Main.onPause()");
+        Log.d(Main.LOG_TAG, "Main.onPause() disable location handler");
+
+        if (appService != null) {
+         appService.onPause();
         }
 
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
         if (preferences.getBoolean(PreferenceKey.SHOW_LOCATION.toString(), false)) {
-            ownLocationOverlay.disableOwnLocation();
+            appService.clearLocationListener();
         }
     }
 
@@ -440,63 +437,54 @@ public void onBeforeDataUpdate() {
     public void onDataUpdate(DataResult result) {
         Log.d(Main.LOG_TAG, "Main.onDataUpdate() " + result);
 
-        if (result.isBackground()) {
-            alarmManager.checkStrokes(result.getStrokes(), result.containsRealtimeData());
-        } else {
-            statusComponent.indicateError(false);
-
-            historyController.setRealtimeData(result.containsRealtimeData());
+        statusComponent.indicateError(false);
 
-            Parameters resultParameters = result.getParameters();
+        historyController.setRealtimeData(result.containsRealtimeData());
 
-            persistor.setCurrentResult(result);
+        Parameters resultParameters = result.getParameters();
 
-            clearDataIfRequested();
-
-            if (result.containsStrokes()) {
-                strokesOverlay.setRasterParameters(result.getRasterParameters());
-                strokesOverlay.setRegion(resultParameters.getRegion());
-                strokesOverlay.setReferenceTime(result.getReferenceTime());
-                strokesOverlay.setIntervalDuration(resultParameters.getIntervalDuration());
-                strokesOverlay.setIntervalOffset(resultParameters.getIntervalOffset());
-
-                if (result.containsIncrementalData()) {
-                    strokesOverlay.expireStrokes();
-                } else {
-                    strokesOverlay.clear();
-                }
-                strokesOverlay.addStrokes(result.getStrokes());
+        persistor.setCurrentResult(result);
 
-                alarmManager.checkStrokes(strokesOverlay.getStrokes(), result.containsRealtimeData());
-                alarmView.setColorHandler(strokesOverlay.getColorHandler(), strokesOverlay.getIntervalDuration());
+        clearDataIfRequested();
 
-                strokesOverlay.refresh();
-            }
+        if (result.containsStrokes()) {
+            strokesOverlay.setRasterParameters(result.getRasterParameters());
+            strokesOverlay.setRegion(resultParameters.getRegion());
+            strokesOverlay.setReferenceTime(result.getReferenceTime());
+            strokesOverlay.setIntervalDuration(resultParameters.getIntervalDuration());
+            strokesOverlay.setIntervalOffset(resultParameters.getIntervalOffset());
 
-            if (!result.containsRealtimeData()) {
-                appService.disable();
-                setHistoricStatusString();
+            if (result.containsIncrementalData()) {
+                strokesOverlay.expireStrokes();
+            } else {
+                strokesOverlay.clear();
             }
+            strokesOverlay.addStrokes(result.getStrokes());
 
-            if (participantsOverlay != null && result.containsParticipants()) {
-                participantsOverlay.setParticipants(result.getStations());
-                participantsOverlay.refresh();
-            }
+            alarmView.setColorHandler(strokesOverlay.getColorHandler(), strokesOverlay.getIntervalDuration());
 
-            for (DataListener listener : dataListeners) {
-                listener.onDataUpdate(result);
-            }
+            strokesOverlay.refresh();
+        }
 
-            statusComponent.stopProgress();
+        if (!result.containsRealtimeData()) {
+            appService.disable();
+            setHistoricStatusString();
+        }
 
-            buttonColumnHandler.enableButtonColumn();
-            getMapView().invalidate();
-            legendView.invalidate();
+        if (participantsOverlay != null && result.containsParticipants()) {
+            participantsOverlay.setParticipants(result.getStations());
+            participantsOverlay.refresh();
         }
 
-        if (appService != null) {
-            appService.releaseWakeLock();
+        for (DataListener listener : dataListeners) {
+            listener.onDataUpdate(result);
         }
+
+        statusComponent.stopProgress();
+
+        buttonColumnHandler.enableButtonColumn();
+        getMapView().invalidate();
+        legendView.invalidate();
     }
 
     private void clearDataIfRequested() {
@@ -538,7 +526,7 @@ protected Dialog onCreateDialog(int id) {
                 break;
 
             case R.id.alarm_dialog:
-                dialog = new AlarmDialog(this, alarmManager, new AlarmDialogColorHandler(PreferenceManager.getDefaultSharedPreferences(this)), strokesOverlay.getIntervalDuration());
+                dialog = new AlarmDialog(this, new AlarmDialogColorHandler(PreferenceManager.getDefaultSharedPreferences(this)), strokesOverlay.getIntervalDuration());
                 break;
 
             case R.id.layer_dialog:
@@ -632,15 +620,17 @@ protected void setStatusString(String runStatus) {
     }
 
     @Override
-    public void onAlarmResult(AlarmResult alarmResult) {
+    public void onAlert(AlarmStatus alarmStatus, AlarmResult alarmResult) {
         AlarmLabelHandler alarmLabelHandler = new AlarmLabelHandler(statusComponent, getResources());
-
         alarmLabelHandler.apply(alarmResult);
+
+        alarmView.onAlert(alarmStatus, alarmResult);
     }
 
     @Override
-    public void onAlarmClear() {
+    public void onAlertCancel() {
         statusComponent.setAlarmText("");
+        alarmView.onAlertCancel();
     }
 
     private void updatePackageInfo() {
@@ -651,4 +641,8 @@ private void updatePackageInfo() {
         }
     }
 
+    @Override
+    public void onLocationChanged(Location location) {
+        ownLocationOverlay.onLocationChanged(location);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/blitzortung/android/app/Persistor.java b/src/main/java/org/blitzortung/android/app/Persistor.java
index f969dba1..f0dd4e65 100644
--- a/src/main/java/org/blitzortung/android/app/Persistor.java
+++ b/src/main/java/org/blitzortung/android/app/Persistor.java
@@ -5,12 +5,11 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.os.Vibrator;
-import org.blitzortung.android.alarm.AlarmManager;
+import org.blitzortung.android.alarm.AlertManager;
 import org.blitzortung.android.alarm.AlarmParameters;
 import org.blitzortung.android.alarm.factory.AlarmObjectFactory;
 import org.blitzortung.android.app.controller.LocationHandler;
 import org.blitzortung.android.app.controller.NotificationHandler;
-import org.blitzortung.android.data.DataHandler;
 import org.blitzortung.android.data.provider.DataResult;
 import org.blitzortung.android.map.overlay.ParticipantsOverlay;
 import org.blitzortung.android.map.overlay.StrokesOverlay;
@@ -19,25 +18,13 @@
 
 public class Persistor {
 
-    private final AlarmManager alarmManager;
-
     private final StrokesOverlay strokesOverlay;
 
     private final ParticipantsOverlay participantsOverlay;
 
     private DataResult currentResult;
 
-    public LocationHandler getLocationHandler() {
-        return locationHandler;
-    }
-
-    private final LocationHandler locationHandler;
-
     public Persistor(Activity activity, SharedPreferences sharedPreferences, PackageInfo pInfo) {
-        locationHandler = new LocationHandler(activity, sharedPreferences);
-        AlarmParameters alarmParameters = new AlarmParameters();
-        alarmParameters.updateSectorLabels(activity);
-        alarmManager = new AlarmManager(locationHandler, sharedPreferences, activity, (Vibrator) activity.getSystemService(Context.VIBRATOR_SERVICE), new NotificationHandler(activity), new AlarmObjectFactory(), alarmParameters);
         strokesOverlay = new StrokesOverlay(activity, new StrokeColorHandler(sharedPreferences));
         participantsOverlay = new ParticipantsOverlay(activity, new ParticipantColorHandler(sharedPreferences));
     }
@@ -45,10 +32,6 @@ public Persistor(Activity activity, SharedPreferences sharedPreferences, Package
     public void updateContext(Main mainActivity) {
         strokesOverlay.setActivity(mainActivity);
         participantsOverlay.setActivity(mainActivity);
-
-        alarmManager.updateContext(mainActivity);
-        alarmManager.clearAlarmListeners();
-        alarmManager.addAlarmListener(mainActivity);
     }
 
     public StrokesOverlay getStrokesOverlay() {
@@ -59,10 +42,6 @@ public ParticipantsOverlay getParticipantsOverlay() {
         return participantsOverlay;
     }
 
-    public AlarmManager getAlarmManager() {
-        return alarmManager;
-    }
-
     public void setCurrentResult(DataResult result) {
         currentResult = result;
     }
diff --git a/src/main/java/org/blitzortung/android/app/controller/NotificationHandler.java b/src/main/java/org/blitzortung/android/app/controller/NotificationHandler.java
index 9e679c99..773693a1 100644
--- a/src/main/java/org/blitzortung/android/app/controller/NotificationHandler.java
+++ b/src/main/java/org/blitzortung/android/app/controller/NotificationHandler.java
@@ -1,7 +1,6 @@
 package org.blitzortung.android.app.controller;
 
 
-import android.app.Activity;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -13,19 +12,19 @@
 public class NotificationHandler {
 
     private final NotificationManager notificationService;
-    private final Activity activity;
+    private final Context context;
 
-    public NotificationHandler(Activity activity) {
-        notificationService = (NotificationManager)activity.getSystemService(Context.NOTIFICATION_SERVICE);
-        this.activity = activity;
+    public NotificationHandler(Context context) {
+        notificationService = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        this.context = context;
 
     }
 
     public void sendNotification(String notificationText) {
         if (notificationService != null) {
             Notification notification = new Notification(R.drawable.icon, notificationText, System.currentTimeMillis());
-            PendingIntent contentIntent = PendingIntent.getActivity(activity, 0, new Intent(activity, Main.class), 0);
-            notification.setLatestEventInfo(activity, activity.getResources().getText(R.string.app_name), notificationText, contentIntent);
+            PendingIntent contentIntent = PendingIntent.getActivity(context, 0, new Intent(context, Main.class), 0);
+            notification.setLatestEventInfo(context, context.getResources().getText(R.string.app_name), notificationText, contentIntent);
 
             notificationService.notify(R.id.alarm_notification_id, notification);
         }
diff --git a/src/main/java/org/blitzortung/android/app/view/AlarmView.java b/src/main/java/org/blitzortung/android/app/view/AlarmView.java
index 2d04c04a..77f6c425 100644
--- a/src/main/java/org/blitzortung/android/app/view/AlarmView.java
+++ b/src/main/java/org/blitzortung/android/app/view/AlarmView.java
@@ -6,9 +6,10 @@
 import android.graphics.Paint.Style;
 import android.util.AttributeSet;
 import android.view.View;
-import org.blitzortung.android.alarm.AlarmManager;
+import org.blitzortung.android.alarm.AlertManager;
 import org.blitzortung.android.alarm.AlarmParameters;
 import org.blitzortung.android.alarm.AlarmResult;
+import org.blitzortung.android.alarm.listener.AlertListener;
 import org.blitzortung.android.alarm.object.AlarmSector;
 import org.blitzortung.android.alarm.object.AlarmSectorRange;
 import org.blitzortung.android.alarm.object.AlarmStatus;
@@ -18,13 +19,13 @@
 
 import java.util.List;
 
-public class AlarmView extends View implements AlarmManager.AlarmListener {
+public class AlarmView extends View implements AlertListener {
 
     private static final int TEXT_MINIMUM_SIZE = 300;
     private static final PorterDuffXfermode XFERMODE_CLEAR = new PorterDuffXfermode(PorterDuff.Mode.CLEAR);
     private static final PorterDuffXfermode XFERMODE_SRC = new PorterDuffXfermode(PorterDuff.Mode.SRC);
 
-    private AlarmManager alarmManager;
+    //private AlertManager alertManager;
 
     private ColorHandler colorHandler;
 
@@ -42,6 +43,8 @@ public class AlarmView extends View implements AlarmManager.AlarmListener {
 
     private Bitmap temporaryBitmap;
     private Canvas temporaryCanvas;
+    private AlarmStatus alarmStatus;
+    private AlarmResult alarmResult;
 
     @SuppressWarnings("unused")
     public AlarmView(Context context, AttributeSet attrs) {
@@ -67,11 +70,6 @@ public AlarmView(Context context, AttributeSet attrs, int defStyle) {
         background.setColor(0xffb0b0b0);
     }
 
-
-    public void setAlarmManager(AlarmManager alarmManager) {
-        this.alarmManager = alarmManager;
-    }
-
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         int parentWidth = MeasureSpec.getSize(widthMeasureSpec);
@@ -84,16 +82,10 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 
     @Override
     protected void onAttachedToWindow() {
-        if (alarmManager != null) {
-            alarmManager.addAlarmListener(this);
-        }
     }
 
     @Override
     protected void onDetachedFromWindow() {
-        if (alarmManager != null) {
-            alarmManager.removeAlarmListener(this);
-        }
     }
 
     @Override
@@ -106,11 +98,8 @@ protected void onDraw(Canvas canvas) {
 
         prepareTemporaryBitmap(size);
 
-        AlarmStatus alarmStatus = alarmManager.getAlarmStatus();
-
         if (alarmStatus != null && intervalDuration != 0) {
-            AlarmParameters alarmParameters = alarmManager.getAlarmParameters();
-
+            AlarmParameters alarmParameters = alarmStatus.getAlarmParameters();
             final float[] rangeSteps = alarmParameters.getRangeSteps();
             final int rangeStepCount = rangeSteps.length;
             final float radiusIncrement = radius / rangeStepCount;
@@ -211,12 +200,16 @@ private void prepareTemporaryBitmap(int size) {
     }
 
     @Override
-    public void onAlarmResult(AlarmResult alarmResult) {
+    public void onAlert(AlarmStatus alarmStatus, AlarmResult alarmResult) {
+        this.alarmStatus = alarmStatus;
+        this.alarmResult = alarmResult;
         invalidate();
     }
 
     @Override
-    public void onAlarmClear() {
+    public void onAlertCancel() {
+        alarmStatus = null;
+        alarmResult = null;
         invalidate();
     }
 
diff --git a/src/main/java/org/blitzortung/android/dialogs/AlarmDialog.java b/src/main/java/org/blitzortung/android/dialogs/AlarmDialog.java
index 6b90fb78..42c1abf6 100644
--- a/src/main/java/org/blitzortung/android/dialogs/AlarmDialog.java
+++ b/src/main/java/org/blitzortung/android/dialogs/AlarmDialog.java
@@ -4,7 +4,7 @@
 import android.content.Context;
 import android.view.KeyEvent;
 import android.view.View;
-import org.blitzortung.android.alarm.AlarmManager;
+import org.blitzortung.android.alarm.AlertManager;
 import org.blitzortung.android.app.R;
 import org.blitzortung.android.app.view.AlarmView;
 import org.blitzortung.android.map.overlay.color.ColorHandler;
@@ -13,7 +13,7 @@ public class AlarmDialog extends AlertDialog {
 
     private final ColorHandler colorHandler;
 
-    public AlarmDialog(Context context, AlarmManager alarmManager, ColorHandler colorHandler, int intervalDuration) {
+    public AlarmDialog(Context context, ColorHandler colorHandler, int intervalDuration) {
 		super(context);
         this.colorHandler = colorHandler;
 
@@ -22,7 +22,6 @@ public AlarmDialog(Context context, AlarmManager alarmManager, ColorHandler colo
 		View dialog = getLayoutInflater().inflate(R.layout.alarm_dialog, null);
 
 		AlarmView alarmView = (AlarmView) dialog.findViewById(R.id.alarm_diagram);
-		alarmView.setAlarmManager(alarmManager);
 		alarmView.setColorHandler(colorHandler, intervalDuration);
 		
 		setView(dialog);
diff --git a/src/main/java/org/blitzortung/android/map/overlay/OwnLocationOverlay.java b/src/main/java/org/blitzortung/android/map/overlay/OwnLocationOverlay.java
index 0890def4..a808c6d3 100644
--- a/src/main/java/org/blitzortung/android/map/overlay/OwnLocationOverlay.java
+++ b/src/main/java/org/blitzortung/android/map/overlay/OwnLocationOverlay.java
@@ -28,11 +28,9 @@ public class OwnLocationOverlay extends ItemizedOverlay<OwnLocationOverlayItem>
 
     private OwnLocationOverlayItem item;
 
-    private final LocationHandler locationManager;
-
     private int zoomLevel;
 
-    public OwnLocationOverlay(Context context, LocationHandler locationHandler, OwnMapView mapView) {
+    public OwnLocationOverlay(Context context, OwnMapView mapView) {
         super(DEFAULT_DRAWABLE);
 
         layerOverlayComponent = new LayerOverlayComponent(context.getResources().getString(R.string.own_location_layer));
@@ -41,9 +39,6 @@ public OwnLocationOverlay(Context context, LocationHandler locationHandler, OwnM
 
         populate();
 
-        this.locationManager = locationHandler;
-        locationHandler.requestUpdates(this);
-
         mapView.addZoomListener(new OwnMapView.ZoomListener() {
 
             @Override
@@ -99,12 +94,9 @@ public void onLocationChanged(Location location) {
     }
 
     public void enableOwnLocation() {
-        locationManager.requestUpdates(this);
     }
 
     public void disableOwnLocation() {
-        locationManager.removeUpdates(this);
-
         item = null;
         populate();
     }
diff --git a/src/test/java/org/blitzortung/android/alarm/AlarmManagerTest.java b/src/test/java/org/blitzortung/android/alarm/AlertManagerTest.java
similarity index 66%
rename from src/test/java/org/blitzortung/android/alarm/AlarmManagerTest.java
rename to src/test/java/org/blitzortung/android/alarm/AlertManagerTest.java
index c7cb9311..0961079c 100644
--- a/src/test/java/org/blitzortung/android/alarm/AlarmManagerTest.java
+++ b/src/test/java/org/blitzortung/android/alarm/AlertManagerTest.java
@@ -8,6 +8,7 @@
 import com.google.common.collect.Lists;
 import org.blitzortung.android.alarm.factory.AlarmObjectFactory;
 import org.blitzortung.android.alarm.handler.AlarmStatusHandler;
+import org.blitzortung.android.alarm.listener.AlertListener;
 import org.blitzortung.android.alarm.object.AlarmSector;
 import org.blitzortung.android.alarm.object.AlarmStatus;
 import org.blitzortung.android.app.controller.LocationHandler;
@@ -34,7 +35,7 @@
 import static org.mockito.Mockito.*;
 
 @RunWith(RobolectricTestRunner.class)
-public class AlarmManagerTest {
+public class AlertManagerTest {
 
     @Mock
     private AlarmParameters alarmParameters;
@@ -73,9 +74,9 @@ public class AlarmManagerTest {
     private Location location;
 
     @Mock
-    private AlarmManager.AlarmListener alarmListener;
+    private AlertListener alarmListener;
 
-    private AlarmManager alarmManager;
+    private AlertManager alertManager;
     
     private Resources resources;
 
@@ -98,84 +99,83 @@ public void setUp() {
         when(alarmStatusHandler.getCurrentActivity(alarmStatus)).thenReturn(alarmResult);
         when(context.getResources()).thenReturn(resources);
         
-        alarmManager = new AlarmManager(locationManager, sharedPreferences, context, vibrator, notificationHandler, alarmObjectFactory, alarmParameters);
-        alarmManager.addAlarmListener(alarmListener);
+        alertManager = new AlertManager(locationManager, sharedPreferences, context, vibrator, notificationHandler, alarmObjectFactory, alarmParameters);
+        alertManager.setAlertListener(alarmListener);
     }
 
     @Test
     public void testConstruction() {
-        assertFalse(alarmManager.isAlarmEnabled());
-        assertThat(alarmManager.alarmListeners.size(), is(1));
+        assertFalse(alertManager.isAlarmEnabled());
 
-        verify(sharedPreferences, times(1)).registerOnSharedPreferenceChangeListener(any(AlarmManager.class));
+        verify(sharedPreferences, times(1)).registerOnSharedPreferenceChangeListener(any(AlertManager.class));
         verify(sharedPreferences, times(1)).getBoolean(PreferenceKey.ALARM_ENABLED.toString(), false);
-        verify(locationManager, times(1)).removeUpdates(any(AlarmManager.class));
+        verify(locationManager, times(1)).removeUpdates(any(AlertManager.class));
         verify(sharedPreferences, times(1)).getString(PreferenceKey.MEASUREMENT_UNIT.toString(), "METRIC");
         verify(alarmParameters, times(1)).setMeasurementSystem(MeasurementSystem.METRIC);
-        verify(alarmListener, times(0)).onAlarmClear();
+        verify(alarmListener, times(0)).onAlertCancel();
     }
 
     @Test
     public void testCheckStrokesWithAlarmDisabledAndLocationUnsetWhenAlarmWasNotActiveBefore() {
-        alarmManager.checkStrokes(strokes, true);
+        alertManager.checkStrokes(strokes);
 
         verify(alarmStatusHandler, times(0)).checkStrokes(alarmStatus, strokes, null);
-        verify(alarmListener, times(0)).onAlarmResult(any(AlarmResult.class));
-        verify(alarmListener, times(0)).onAlarmClear();
+        verify(alarmListener, times(0)).onAlert(alarmStatus, any(AlarmResult.class));
+        verify(alarmListener, times(0)).onAlertCancel();
     }
 
     @Test
     public void testCheckStrokesWithAlarmDisabledAndLocationUnset() {
         makeAlarmsValid();
-        verify(alarmListener, times(1)).onAlarmResult(any(AlarmResult.class));
-        verify(alarmListener, times(0)).onAlarmClear();
+        verify(alarmListener, times(1)).onAlert(alarmStatus, any(AlarmResult.class));
+        verify(alarmListener, times(0)).onAlertCancel();
 
-        alarmManager.onLocationChanged(null);
-        alarmManager.checkStrokes(strokes, true);
+        alertManager.onLocationChanged(null);
+        alertManager.checkStrokes(strokes);
 
         verify(alarmStatusHandler, times(0)).checkStrokes(alarmStatus, strokes, null);
-        verify(alarmListener, times(1)).onAlarmResult(any(AlarmResult.class));
-        verify(alarmListener, times(1)).onAlarmClear();
+        verify(alarmListener, times(1)).onAlert(alarmStatus, any(AlarmResult.class));
+        verify(alarmListener, times(1)).onAlertCancel();
     }
 
     @Test
     public void testCheckStrokesWithAlarmDisabledAndLocationSet() {
         makeAlarmsValid();
         enableAlarmInPrefs(false);
-        verify(alarmListener, times(1)).onAlarmResult(any(AlarmResult.class));
-        verify(alarmListener, times(1)).onAlarmClear();
+        verify(alarmListener, times(1)).onAlert(alarmStatus, any(AlarmResult.class));
+        verify(alarmListener, times(1)).onAlertCancel();
 
-        alarmManager.checkStrokes(strokes, true);
+        alertManager.checkStrokes(strokes);
 
         verify(alarmStatusHandler, times(0)).checkStrokes(alarmStatus, strokes, null);
-        verify(alarmListener, times(1)).onAlarmResult(any(AlarmResult.class));
-        verify(alarmListener, times(2)).onAlarmClear();
+        verify(alarmListener, times(1)).onAlert(alarmStatus, any(AlarmResult.class));
+        verify(alarmListener, times(2)).onAlertCancel();
     }
 
     @Test
     public void testCheckStrokesWithAlarmEnabledAndLocationSet() {
         enableAlarmInPrefs(true);
-        alarmManager.onLocationChanged(location);
+        alertManager.onLocationChanged(location);
 
         when(alarmStatusHandler.getCurrentActivity(alarmStatus)).thenReturn(alarmResult);
 
-        alarmManager.checkStrokes(strokes, true);
+        alertManager.checkStrokes(strokes);
 
         verify(alarmStatusHandler, times(1)).checkStrokes(alarmStatus, strokes, location);
-        verify(alarmListener, times(1)).onAlarmResult(alarmResult);
-        verify(alarmListener, times(0)).onAlarmClear();
+        verify(alarmListener, times(1)).onAlert(alarmStatus, alarmResult);
+        verify(alarmListener, times(0)).onAlertCancel();
     }
 
     @Test
     public void testGetAlarmResult() {
-        AlarmResult returnedAlarmResult = alarmManager.getAlarmResult();
+        AlarmResult returnedAlarmResult = alertManager.getAlarmResult();
         
         assertThat(returnedAlarmResult, is(nullValue()));
         verify(alarmStatusHandler, times(0)).getCurrentActivity(alarmStatus);
 
         makeAlarmsValid();
 
-        returnedAlarmResult = alarmManager.getAlarmResult();
+        returnedAlarmResult = alertManager.getAlarmResult();
         
         assertThat(returnedAlarmResult, is(sameInstance(alarmResult)));
         verify(alarmStatusHandler, times(2)).getCurrentActivity(alarmStatus);
@@ -183,74 +183,44 @@ public void testGetAlarmResult() {
 
     @Test
     public void testGetAlarmStatus() {
-        AlarmStatus returnedAlarmStatus = alarmManager.getAlarmStatus();
+        AlarmStatus returnedAlarmStatus = alertManager.getAlarmStatus();
 
         assertThat(returnedAlarmStatus, is(nullValue()));
 
         makeAlarmsValid();
 
-        returnedAlarmStatus = alarmManager.getAlarmStatus();
+        returnedAlarmStatus = alertManager.getAlarmStatus();
 
         assertThat(returnedAlarmStatus, is(sameInstance(alarmStatus)));
     }
 
     private void makeAlarmsValid() {
-        alarmManager.onLocationChanged(location);
+        alertManager.onLocationChanged(location);
         enableAlarmInPrefs(true);
-        alarmManager.checkStrokes(Lists.<Stroke>newArrayList(), true);
+        alertManager.checkStrokes(Lists.<Stroke>newArrayList());
     }
 
     private void enableAlarmInPrefs(boolean alarmEnabled) {
         when(sharedPreferences.getBoolean(PreferenceKey.ALARM_ENABLED.toString(), false)).thenReturn(alarmEnabled);
-        alarmManager.onSharedPreferenceChanged(sharedPreferences, PreferenceKey.ALARM_ENABLED.toString());
+        alertManager.onSharedPreferenceChanged(sharedPreferences, PreferenceKey.ALARM_ENABLED.toString());
     }
 
     @Test
     public void testGetTextMessage() {
         when(alarmStatusHandler.getTextMessage(alarmStatus, 10.0f)).thenReturn("<message>");
 
-        final String textMessage = alarmManager.getTextMessage(10.0f);
+        final String textMessage = alertManager.getTextMessage(10.0f);
 
         verify(alarmStatusHandler, times(1)).getTextMessage(alarmStatus, 10.0f);
         assertThat(textMessage, is("<message>"));
     }
 
-    @Test
-    public void testAddAndClearAlarmListener() {
-        assertThat(alarmManager.getAlarmListeners().size(), is(1));
-
-        alarmManager.clearAlarmListeners();
-
-        assertThat(alarmManager.getAlarmListeners().size(), is(0));
-
-        alarmManager.addAlarmListener(mock(AlarmManager.AlarmListener.class));
-        alarmManager.addAlarmListener(mock(AlarmManager.AlarmListener.class));
-
-        assertThat(alarmManager.getAlarmListeners().size(), is(2));
-    }
-    
-    @Test
-    public void testRemoveAlarmListener() {
-        assertThat(alarmManager.getAlarmListeners().size(), is(1));
-
-        alarmManager.removeAlarmListener(alarmListener);
-
-        assertThat(alarmManager.getAlarmListeners().size(), is(0));
-
-        alarmManager.addAlarmListener(mock(AlarmManager.AlarmListener.class));
-        alarmManager.addAlarmListener(alarmListener);
-
-        alarmManager.removeAlarmListener(alarmListener);
-
-        assertThat(alarmManager.getAlarmListeners().size(), is(1));
-    }
-    
     @Test
     public void testGetAlarmSectors() {
         final Collection<AlarmSector> alarmSectors = Lists.newArrayList();
         when(alarmStatus.getSectors()).thenReturn(alarmSectors);
 
-        final Collection<AlarmSector> returnedAlarmSectors = alarmManager.getAlarmSectors();
+        final Collection<AlarmSector> returnedAlarmSectors = alertManager.getAlarmSectors();
         
         assertThat(returnedAlarmSectors, is(sameInstance(alarmSectors)));
         verify(alarmStatus, times(1)).getSectors();
@@ -258,7 +228,7 @@ public void testGetAlarmSectors() {
     
     @Test
     public void testGetAlarmParameters() {
-        final AlarmParameters returnedAlarmParameters = alarmManager.getAlarmParameters();
+        final AlarmParameters returnedAlarmParameters = alertManager.getAlarmParameters();
         
         assertThat(returnedAlarmParameters, is(sameInstance(alarmParameters)));
     }
diff --git a/src/test/java/org/blitzortung/android/map/overlay/OwnLocationOverlayTest.java b/src/test/java/org/blitzortung/android/map/overlay/OwnLocationOverlayTest.java
index 1f217105..0cfcbc44 100644
--- a/src/test/java/org/blitzortung/android/map/overlay/OwnLocationOverlayTest.java
+++ b/src/test/java/org/blitzortung/android/map/overlay/OwnLocationOverlayTest.java
@@ -123,7 +123,7 @@ public void setUp()
         when(context.getApplicationContext()).thenReturn(Robolectric.application);
         when(mapView.getOverlays()).thenReturn(overlays);
 
-        ownLocationOverlay = new OwnLocationOverlay(context, locationHandler, mapView);
+        ownLocationOverlay = new OwnLocationOverlay(context, mapView);
     }
 
     @Test