diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4ff10f68a5..83405b8de1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -91,7 +91,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9375f3dd35..97b9126cee 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="12" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SimpleHandlerThreadPool.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SimpleHandlerThreadPool.java
index 27a87f8b63..efe6e6d94c 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SimpleHandlerThreadPool.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SimpleHandlerThreadPool.java
@@ -235,13 +235,14 @@ public class SimpleHandlerThreadPool {
                 startPoint.point = lastPoint;
                 startPoint.marker = marker;
                 startPoint.angle = ( float ) lastPosition.getHeading();
-                List< BaseDrawer.MovingPoint > points = BaseDrawer.interpolate( startPoint, endPoint, 30, interval );
+                List< BaseDrawer.MovingPoint > points = BaseDrawer.interpolate( startPoint, endPoint, 20, interval );
                 Message msg = new Message();
                 BaseDrawer.MovingPoints obj = new BaseDrawer.MovingPoints();
                 obj.points = points;
-                msg.obj = obj;
-                msg.what = MSG_POINTS_SETTING;
-                renderHandler.sendMessage( msg );
+                startSettingPointLooper(obj);
+//                msg.obj = obj;
+//                msg.what = MSG_POINTS_SETTING;
+//                renderHandler.sendMessage( msg );
 //            marker.startSmoothInMs( points, interval );
 //            marker.addDynamicAnchorPosition( endLatLon, interval );
                 Logger.d( TAG, "anim duration: %s, points size = %s", interval, points.size() );
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
index d0fd826f6d..17755e7ac7 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
@@ -557,9 +557,9 @@ public class MockIntentHandler implements IntentHandler {
                 break;
             case 47:
                 mLocationMockHandler.sendEmptyMessageDelayed( 1, 200L );
-//                mLocationMockHandler.sendEmptyMessageDelayed( 2, 0 );
+                mLocationMockHandler.sendEmptyMessageDelayed( 2, 0 );
 //                mLocationMockHandler.sendEmptyMessageDelayed( 21, 200 );
-                mLocationMockHandler.sendEmptyMessageDelayed( 3, 0L );
+//                mLocationMockHandler.sendEmptyMessageDelayed( 3, 0L );
 //                mLocationMockHandler.sendEmptyMessageDelayed( 5, 0L );
                 break;
         }