diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7a80636..0e697ea 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -44,7 +44,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/demo/build.gradle b/demo/build.gradle
index e0940b2..91b7b94 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 23
         versionCode 1
-        versionName "1.2"
+        versionName "2.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/demo/src/main/java/com/potterhsu/marquee/demo/MainActivity.java b/demo/src/main/java/com/potterhsu/marquee/demo/MainActivity.java
index 50cc389..2e3ca88 100644
--- a/demo/src/main/java/com/potterhsu/marquee/demo/MainActivity.java
+++ b/demo/src/main/java/com/potterhsu/marquee/demo/MainActivity.java
@@ -16,9 +16,10 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
+        String text = "How are you today? 你今天好嗎？ 你今天好吗？ 今日は元気ですか？ 오늘 어떠니? Quid agis hodie? Comment vas-tu aujourd'hui? Πώς είσαι σήμερα? Kuinka voit tänään? วันนี้คุณเป็นอย่างไร?";
         marqueeTextFragment = new MarqueeTextFragment();
         marqueeTextFragment.setMarqueeInfo(
-                new MarqueeTextFragment.MarqueeInfo("This is a good day, 歡迎光臨！", Color.BLUE, 0.5f)
+                new MarqueeTextFragment.MarqueeInfo(text, Color.BLUE, 0.5f)
         );
         getFragmentManager().beginTransaction()
                 .replace(R.id.layoutMarquee, marqueeTextFragment)
diff --git a/demo/src/main/res/layout/activity_main.xml b/demo/src/main/res/layout/activity_main.xml
index ebf7cba..dc4017d 100644
--- a/demo/src/main/res/layout/activity_main.xml
+++ b/demo/src/main/res/layout/activity_main.xml
@@ -14,7 +14,7 @@
     <FrameLayout
         android:id="@+id/layoutMarquee"
         android:layout_width="match_parent"
-        android:layout_height="300dp" />
+        android:layout_height="100dp" />
 
     <Button
         android:id="@+id/btnStart"
diff --git a/library/build.gradle b/library/build.gradle
index 21e2d1f..cf15506 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 23
         versionCode 2
-        versionName "1.2"
+        versionName "2.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
diff --git a/library/src/main/java/com/potterhsu/marqueetextview/MarqueeTextFragment.java b/library/src/main/java/com/potterhsu/marqueetextview/MarqueeTextFragment.java
index 6c0afdc..23237e4 100644
--- a/library/src/main/java/com/potterhsu/marqueetextview/MarqueeTextFragment.java
+++ b/library/src/main/java/com/potterhsu/marqueetextview/MarqueeTextFragment.java
@@ -1,11 +1,21 @@
 package com.potterhsu.marqueetextview;
 
 import android.app.Fragment;
+import android.graphics.Paint;
+import android.graphics.Rect;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.LinearInterpolator;
+import android.view.animation.TranslateAnimation;
+import android.widget.FrameLayout;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by PoterHsu on 3/7/17.
@@ -13,27 +23,177 @@
 
 public class MarqueeTextFragment extends Fragment {
 
-    private MarqueeTextView marqueeTextView;
+    public static final String TAG = MarqueeTextFragment.class.getSimpleName();
+
+    private FrameLayout layoutRoot;
     private MarqueeInfo marqueeInfo;
+    private List<String> textParts;
+
+    private int viewWidth;
+    private int viewHeight;
 
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_marquee_text, container, false);
-        marqueeTextView = (MarqueeTextView) view.findViewById(R.id.tvMarquee);
-        marqueeTextView.setText(marqueeInfo.getText());
-        marqueeTextView.setColor(marqueeInfo.getColor());
-        marqueeTextView.setSpeed(marqueeInfo.getSpeed());
-        marqueeTextView.start();
+
+        layoutRoot = (FrameLayout) view.findViewById(R.id.layoutRoot);
+
+        view.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+            @Override
+            public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                viewWidth = right - left;
+                viewHeight = bottom - top;
+            }
+        });
+
+        view.post(new Runnable() {
+            @Override
+            public void run() {
+                Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+                float textSize = Math.min(viewHeight * MarqueeTextView.TEXT_SCALE, MarqueeTextView.TEXT_MAX_SIZE);
+                paint.setTextSize(textSize);
+                textParts = splitByTextWidth(marqueeInfo.getText(), viewWidth, paint);
+
+                for (String textPart : textParts) {
+                    Log.d(TAG, "textPart: " + textPart);
+                }
+
+                startMarquee();
+            }
+        });
+
         return view;
     }
 
+    private List<String> splitByTextWidth(String text, int splitWidth, Paint paint) {
+        List<String> strings = new ArrayList<>();
+
+        int start = 0;
+        int end = start;
+
+        while (start < text.length()) {
+            while(true) {
+                end += 1;
+                if (end == text.length())
+                    break;
+
+                Rect bounds = new Rect();
+                paint.getTextBounds(text, start, end, bounds);
+                if (bounds.width() > splitWidth)
+                    break;
+            }
+
+            strings.add(text.substring(start, end));
+            start = end;
+        }
+
+        return strings;
+    }
+
     public void startMarquee() {
-        marqueeTextView.start();
+        startMarquee(0, null);
+    }
+
+    public void startMarquee(final int index, final Integer initFrom) {
+        final MarqueeTextView marqueeTextView = new MarqueeTextView(getActivity());
+        marqueeTextView.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        marqueeTextView.setText(textParts.get(index));
+        marqueeTextView.setColor(marqueeInfo.getColor());
+        marqueeTextView.setVisibility(View.INVISIBLE);
+        layoutRoot.addView(marqueeTextView);
+
+        marqueeTextView.post(new Runnable() {
+            @Override
+            public void run() {
+                final float from = index == 0 ? viewWidth : initFrom;
+                final float to = -1f * marqueeTextView.getTextWidthFromMeasurement();
+
+                if (BuildConfig.DEBUG) {
+                    Log.d(TAG, "start: from = " + from + ", to = " + to);
+                }
+
+                Animation animation1 = new TranslateAnimation(from, 0, 0, 0);
+                animation1.setDuration((long) ((from - 0) / marqueeInfo.getSpeed()));
+                animation1.setInterpolator(new LinearInterpolator());
+                animation1.setAnimationListener(new Animation.AnimationListener() {
+                    @Override
+                    public void onAnimationStart(Animation animation) {
+
+                    }
+
+                    @Override
+                    public void onAnimationEnd(Animation animation) {
+                        /** first stage **/
+                        if (BuildConfig.DEBUG) {
+                            Log.d(TAG, textParts.get(index) + " arrived first stage");
+                        }
+
+                        Animation animation2 = new TranslateAnimation(0, to, 0, 0);
+                        animation2.setDuration((long) ((0 - to) / marqueeInfo.getSpeed()));
+                        animation2.setInterpolator(new LinearInterpolator());
+                        animation2.setAnimationListener(new Animation.AnimationListener() {
+                            @Override
+                            public void onAnimationStart(Animation animation) {
+
+                            }
+
+                            @Override
+                            public void onAnimationEnd(Animation animation) {
+                                /** second stage **/
+                                if (BuildConfig.DEBUG) {
+                                    Log.d(TAG, textParts.get(index) + " arrived second stage");
+                                }
+                                // clear self
+                                marqueeTextView.clearAnimation();
+                                layoutRoot.removeView(marqueeTextView);
+
+                                int childCount = layoutRoot.getChildCount();
+                                if (BuildConfig.DEBUG) {
+                                    Log.d(TAG, "childCount: " + childCount);
+                                }
+                                if (childCount == 0)    // after all marquee had run over, restart marquee
+                                    startMarquee();
+                            }
+
+                            @Override
+                            public void onAnimationRepeat(Animation animation) {
+
+                            }
+                        });
+                        marqueeTextView.startAnimation(animation2); // animation from `0` to `to`
+
+                        // prepare for following marquee
+                        if (index + 1 < textParts.size()) {
+                            if (BuildConfig.DEBUG) {
+                                Log.d(TAG, textParts.get(index + 1) + " is preparing");
+                            }
+                            startMarquee(index + 1, (int) marqueeTextView.getTextWidthFromMeasurement());
+                        } else {
+                            if (BuildConfig.DEBUG) {
+                                Log.d(TAG, "no rest marquee");
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onAnimationRepeat(Animation animation) {
+
+                    }
+                });
+                marqueeTextView.startAnimation(animation1); // animation from `from` to `0`
+                marqueeTextView.setVisibility(View.VISIBLE);
+            }
+        });
     }
 
     public void stopMarquee() {
-        marqueeTextView.stop();
+        for (int i = 0; i < layoutRoot.getChildCount(); ++i) {
+            View v = layoutRoot.getChildAt(i);
+            v.getAnimation().setAnimationListener(null);
+            v.clearAnimation();
+        }
+        layoutRoot.removeAllViews();
     }
 
     public void setMarqueeInfo(MarqueeInfo marqueeInfo) {
diff --git a/library/src/main/java/com/potterhsu/marqueetextview/MarqueeTextView.java b/library/src/main/java/com/potterhsu/marqueetextview/MarqueeTextView.java
index f3bcb88..cb35ba6 100644
--- a/library/src/main/java/com/potterhsu/marqueetextview/MarqueeTextView.java
+++ b/library/src/main/java/com/potterhsu/marqueetextview/MarqueeTextView.java
@@ -6,10 +6,8 @@
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.View;
-import android.view.animation.Animation;
-import android.view.animation.LinearInterpolator;
-import android.view.animation.TranslateAnimation;
 
 /**
  * Created by PoterHsu on 12/30/16.
@@ -18,14 +16,15 @@
 public class MarqueeTextView extends View {
 
     public static final String TAG = MarqueeTextView.class.getSimpleName();
-    private static final float DEFAULT_SPEED = 0.5f;
+    public static final float TEXT_SCALE = 0.7f;
+    public static final float TEXT_MAX_SIZE = 300;
 
     private String text = "";
-    private float speed = DEFAULT_SPEED;
 
     private Paint paint;
     private Rect viewBounds = new Rect();
     private Rect textBounds = new Rect();
+    private float textWidthFromMeasurement;
 
 
     public MarqueeTextView(Context context) {
@@ -56,41 +55,26 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
                 MeasureSpec.getSize(widthMeasureSpec),
                 MeasureSpec.getSize(heightMeasureSpec));
 
-        float textSize = Math.min(viewBounds.height() * 0.8f, 300);
+        float textSize = Math.min(viewBounds.height() * TEXT_SCALE, TEXT_MAX_SIZE);
         paint.setTextSize(textSize);
         paint.getTextBounds(this.text, 0, this.text.length(), textBounds);
 
-//        Log.d(TAG, "onMeasure: " +
-//                        "viewBounds.width() = " + viewBounds.width() + ", " +
-//                        "viewBounds.height() = " + viewBounds.height() + ", " +
-//                        "textBounds.width() = " + textBounds.width() + ", " +
-//                        "textBounds.height() = " + textBounds.height());
-    }
-
-    public void start() {
-        this.post(new Runnable() {
-            @Override
-            public void run() {
-                float from = viewBounds.width();
-                float to = -1f * textBounds.width();
-
-//                Log.d(TAG, "start: from = " + from + ", to = " + to);
-
-                Animation animation = new TranslateAnimation(from, to, 0, 0);
-                animation.setRepeatMode(Animation.INFINITE);
-                animation.setRepeatCount(-1);
-                animation.setInterpolator(new LinearInterpolator());
-                animation.setDuration( (long) ((from - to) * (1 / speed)) );
-                startAnimation(animation);
-
-                setVisibility(VISIBLE);
-            }
-        });
-    }
-
-    public void stop() {
-        setVisibility(INVISIBLE);
-        clearAnimation();
+        textWidthFromMeasurement = paint.measureText(this.text);
+
+        /**
+         * Note:
+         *      String starts with `，` will make width measured by `getTextBounds` inaccurate,
+         *      but by `measureText` is accurate.
+         */
+
+        if (BuildConfig.DEBUG) {
+            Log.d(TAG, "onMeasure: " +
+                    "viewBounds.width() = " + viewBounds.width() + ", " +
+                    "viewBounds.height() = " + viewBounds.height() + ", " +
+                    "textBounds.width() = " + textBounds.width() + ", " +
+                    "textBounds.height() = " + textBounds.height() + ", " +
+                    "textWidthFromMeasurement = " + textWidthFromMeasurement);
+        }
     }
 
     public String getText() {
@@ -106,8 +90,16 @@ public void setColor(int color) {
         paint.setColor(color);
     }
 
-    public void setSpeed(float speed) {
-        this.speed = speed;
+    public Rect getViewBounds() {
+        return viewBounds;
+    }
+
+    public Rect getTextBounds() {
+        return textBounds;
+    }
+
+    public float getTextWidthFromMeasurement() {
+        return textWidthFromMeasurement;
     }
 
     @Override
diff --git a/library/src/main/res/layout/fragment_marquee_text.xml b/library/src/main/res/layout/fragment_marquee_text.xml
index f5737f0..3c8557b 100644
--- a/library/src/main/res/layout/fragment_marquee_text.xml
+++ b/library/src/main/res/layout/fragment_marquee_text.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layoutRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipChildren="false">
 
-    <com.potterhsu.marqueetextview.MarqueeTextView
-        android:id="@+id/tvMarquee"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
 </FrameLayout>
\ No newline at end of file