diff --git a/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java b/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java
index fa81aeb..39e9079 100755
--- a/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java
+++ b/core/src/zero1hd/polyjet/audio/map/GamePlayMap.java
@@ -1,6 +1,12 @@
 package zero1hd.polyjet.audio.map;
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.audio.Music;
+import com.badlogic.gdx.math.MathUtils;
+>>>>>>> parent of e4359f4... tuning and adjustments
 =======
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.audio.Music;
@@ -101,9 +107,12 @@ public class GamePlayMap {
 		playableClip.readIndexUpdate();
 		if (index != playableClip.getReadIndex()) {
 			index = playableClip.getReadIndex();
+<<<<<<< HEAD
 <<<<<<< HEAD
 			return nextEntityBatch(false);
 =======
+=======
+>>>>>>> parent of e4359f4... tuning and adjustments
 			Gdx.app.debug("GPM", "index: " + index);
 			return nextEntity(false);
 >>>>>>> parent of e4359f4... tuning and adjustments
diff --git a/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java b/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java
index f17beef..cda08c1 100755
--- a/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java
+++ b/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java
@@ -56,7 +56,12 @@ public class RhythmMapAlgorithm implements Runnable {
 		map.beginBuild();
 		for (int index = 0; index < bassPeaks.size; index++) {
 			if (bassPeaks.get(index) != 0 || UMPeaks.get(index) != 0) {
+<<<<<<< HEAD
 				if (bassPeaks.get(index) > avgBass) {
+=======
+				int warningTime = (int) ((3/speedMod)*windowPerSecond);
+				if ((index+warningTime < bassPeaks.size) && bassPeaks.get(index + warningTime) >= avgBass) {
+>>>>>>> parent of e4359f4... tuning and adjustments
 					//TODO basic void circle spawning
 					float endRadius = (bassPeaks.get(index)/bassMax)*(Polyjet.GAME_AREA_HEIGHT/2f);
 					
@@ -64,7 +69,7 @@ public class RhythmMapAlgorithm implements Runnable {
 							endRadius, 
 							rand.nextFloat()*Polyjet.GAME_AREA_WIDTH, 
 							rand.nextFloat()*Polyjet.GAME_AREA_HEIGHT,
-							endRadius/(avgSPB*0.6f),
+							endRadius/(avgSPB*0.5f),
 							3f/speedMod
 							);
 				}