diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e17cb11..21af5fd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -33,7 +33,7 @@
             
         </activity>
         
-        <service android:name=".MusicService"></service>
+        
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/assets/theme.ogg b/assets/theme.ogg
deleted file mode 100644
index e4b8277..0000000
Binary files a/assets/theme.ogg and /dev/null differ
diff --git a/src/cz/gug/hackathon/mantattan/MainActivity.java b/src/cz/gug/hackathon/mantattan/MainActivity.java
index 8328612..4d6a543 100644
--- a/src/cz/gug/hackathon/mantattan/MainActivity.java
+++ b/src/cz/gug/hackathon/mantattan/MainActivity.java
@@ -2,7 +2,7 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import android.media.AudioManager;
+import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.view.View;
 import android.view.Window;
@@ -13,13 +13,18 @@ public class MainActivity extends Activity {
 	
 	//private static final String TAG = MainActivity.class.getSimpleName();
 	//private DataTable dataTable;
-
+	private MediaPlayer mp ;
+	
 	@Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         this.requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.main);
-        this.setVolumeControlStream(AudioManager.STREAM_MUSIC);
+        
+        mp = MediaPlayer.create(getApplicationContext(), R.raw.theme);
+        mp.start();
+
+
 //        dataTable = new DataTable(3, 2);
 //        Log.d(TAG, "====================================================");
 //        dataTable.shuffle(0);
@@ -47,4 +52,46 @@ public void onClick(View v) {
         
 
     }
+	
+	@Override
+	protected void onResume() {
+		mp = MediaPlayer.create(getApplicationContext(), R.raw.theme);
+	    if (!mp.isPlaying()){
+	    	mp.start();
+	    }
+		
+		super.onResume();
+	}
+	
+	@Override
+	protected void onStart() {
+		
+	    if (!mp.isPlaying()){
+	    	mp.start();
+	    }
+		
+		super.onStart();
+	}
+	
+	@Override
+	protected void onPause() {
+		
+		if (mp.isPlaying()){
+	    	mp.stop();
+	    }
+		
+		super.onPause();
+	}
+	
+	@Override
+	protected void onStop() {
+		
+		if (mp.isPlaying()){
+	    	mp.stop();
+	    }
+		
+		super.onStop();
+	}
+	
+	
 }
\ No newline at end of file
diff --git a/src/cz/gug/hackathon/mantattan/MusicService.java b/src/cz/gug/hackathon/mantattan/MusicService.java
deleted file mode 100644
index f7e6f64..0000000
--- a/src/cz/gug/hackathon/mantattan/MusicService.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package cz.gug.hackathon.mantattan;
-
-import java.io.IOException;
-
-import android.app.Service;
-import android.content.Intent;
-import android.content.res.AssetFileDescriptor;
-import android.content.res.AssetManager;
-import android.database.sqlite.SQLiteDatabase;
-import android.media.MediaPlayer;
-import android.media.MediaPlayer.OnPreparedListener;
-import android.os.IBinder;
-import android.util.Log;
-
-public class MusicService extends Service implements OnPreparedListener {
-
-	static final String TAG = "MusicService";
-
-	private WeedCrusherApp weedCrusherApp;
-	AssetManager assetManager;
-	MediaPlayer mediaPlayer;
-	private boolean playerOK = false;
-	private boolean runFlag = false;
-	SQLiteDatabase db;
-
-	@Override
-	public void onCreate() {
-		super.onCreate();
-
-		weedCrusherApp = (WeedCrusherApp) getApplication();
-		assetManager = getApplicationContext().getAssets();
-
-		mediaPlayer = new MediaPlayer();
-		AssetFileDescriptor descriptor;
-		try {			
-			descriptor = assetManager.openFd("theme.ogg");
-			mediaPlayer.setDataSource(descriptor.getFileDescriptor(),
-					descriptor.getStartOffset(), descriptor.getLength());
-			mediaPlayer.setOnPreparedListener(this);
-			mediaPlayer.prepareAsync();
-			mediaPlayer.setLooping(true);
-			
-		} catch (IOException e) {
-			Log.d(TAG, "Unable to open audio file.");
-			e.printStackTrace();
-		} catch (IllegalStateException e) {
-			Log.d(TAG, "Unable to start audio playback.");
-			e.printStackTrace();
-		}
-
-		Log.d(TAG, "onCreated");
-	}
-
-	@Override
-	public int onStartCommand(Intent intent, int flags, int startId) {
-		super.onStartCommand(intent, flags, startId);
-
-		this.runFlag = true;
-
-		if (playerOK) {
-			if (!(mediaPlayer.isPlaying())) {
-				mediaPlayer.start();
-			}
-			this.weedCrusherApp.setMusicServiceRunning(runFlag);
-		}
-
-		Log.d(TAG, "onStarted");
-		return START_STICKY;
-	}
-
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-
-		this.runFlag = false;
-		if (playerOK) {
-			if (mediaPlayer.isPlaying()) {
-				mediaPlayer.stop();
-				mediaPlayer.release();
-			}
-			this.weedCrusherApp.setMusicServiceRunning(runFlag);
-		}
-
-		Log.d(TAG, "onDestroyed");
-	}
-
-	@Override
-	public IBinder onBind(Intent arg0) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void onPrepared(MediaPlayer mp) {
-		playerOK = true;		
-	}
-
-}
diff --git a/src/cz/gug/hackathon/mantattan/WeedCrusherApp.java b/src/cz/gug/hackathon/mantattan/WeedCrusherApp.java
index f96bfa0..2355f23 100644
--- a/src/cz/gug/hackathon/mantattan/WeedCrusherApp.java
+++ b/src/cz/gug/hackathon/mantattan/WeedCrusherApp.java
@@ -32,14 +32,14 @@ public void onCreate() { //
 //		this.prefs = PreferenceManager.getDefaultSharedPreferences(this);
 //		this.prefs.registerOnSharedPreferenceChangeListener(this);
 		dataTable = new DataTable(numRows, numCols);
-		startService(new Intent(this, MusicService.class));
+		
 		Log.i(TAG, "onCreated");
 	}
 
 	@Override
 	public void onTerminate() { //
 		super.onTerminate();
-		stopService(new Intent(this, MusicService.class));
+		
 		Log.i(TAG, "onTerminated");
 	}