diff --git a/app/build.gradle b/app/build.gradle
index 075992a..4349f3c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,10 +22,11 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(path: ':tagcloudlib')
+    //compile project(path: ':tagcloudlib')
     compile 'com.android.support:appcompat-v7:23.2.1'
     compile 'com.android.support:design:23.2.1'
     compile 'com.android.support:support-vector-drawable:23.2.0'
     compile 'com.android.support:animated-vector-drawable:23.2.0'
     compile 'com.android.support:support-v4:23.2.1'
+    compile 'com.moxun:tagcloudlib:1.2.0'
 }
diff --git a/app/src/main/java/com/moxun/tagcloud/MainActivity.java b/app/src/main/java/com/moxun/tagcloud/MainActivity.java
index 2c353d2..c51ff54 100644
--- a/app/src/main/java/com/moxun/tagcloud/MainActivity.java
+++ b/app/src/main/java/com/moxun/tagcloud/MainActivity.java
@@ -3,7 +3,6 @@
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
diff --git a/app/src/main/java/com/moxun/tagcloud/TextTagsAdapter.java b/app/src/main/java/com/moxun/tagcloud/TextTagsAdapter.java
index 8d4d217..1f5e4e3 100644
--- a/app/src/main/java/com/moxun/tagcloud/TextTagsAdapter.java
+++ b/app/src/main/java/com/moxun/tagcloud/TextTagsAdapter.java
@@ -1,6 +1,7 @@
 package com.moxun.tagcloud;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.Gravity;
@@ -44,6 +45,7 @@ public void onClick(View v) {
                 Toast.makeText(context, "Tag " + position + " clicked", Toast.LENGTH_SHORT).show();
             }
         });
+        tv.setTextColor(Color.WHITE);
         return tv;
     }
 
@@ -59,6 +61,6 @@ public int getPopularity(int position) {
 
     @Override
     public void onThemeColorChanged(View view, int themeColor) {
-        ((TextView) view).setTextColor(themeColor);
+        view.setBackgroundColor(themeColor);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0445bf4..d96e5f9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,69 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/container"
+    tools:context="com.moxun.tagcloud.MainActivity"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical">
 
-    <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/container"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="vertical"
-        tools:context="com.moxun.tagcloud.MainActivity">
+        android:layout_height="20dp"
+        android:orientation="horizontal">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="20dp"
-            android:orientation="horizontal">
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@color/tagLight" />
 
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@color/tagLight" />
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@color/tagDark" />
-        </LinearLayout>
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@color/tagDark" />
+    </LinearLayout>
 
-        <com.moxun.tagcloudlib.view.TagCloudView
-            android:id="@+id/tag_cloud"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            app:autoScrollMode="uniform"
-            app:darkColor="@color/tagDark"
-            app:lightColor="@color/tagLight"
-            app:radiusPercent="0.6"
-            app:scrollSpeed="3" />
+    <com.moxun.tagcloudlib.view.TagCloudView
+        android:id="@+id/tag_cloud"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        app:autoScrollMode="uniform"
+        app:darkColor="@color/tagDark"
+        app:lightColor="@color/tagLight"
+        app:radiusPercent="0.6"
+        app:scrollSpeed="3" />
 
-        <Button
-            android:id="@+id/tag_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Simple Text Tag" />
+    <Button
+        android:id="@+id/tag_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Simple Text Tag" />
 
-        <Button
-            android:id="@+id/tag_view"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Custom View Tag" />
+    <Button
+        android:id="@+id/tag_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Custom View Tag" />
 
-        <Button
-            android:id="@+id/tag_vector"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="VectorDrawable Tag" />
+    <Button
+        android:id="@+id/tag_vector"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="VectorDrawable Tag" />
 
-        <Button
-            android:id="@+id/test_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Using in Fragment" />
+    <Button
+        android:id="@+id/test_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Using in Fragment" />
 
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5885930..0eb88fe 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/tagcloudlib/build.gradle b/tagcloudlib/build.gradle
index 7acbfc3..ab64105 100644
--- a/tagcloudlib/build.gradle
+++ b/tagcloudlib/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "1.1.3"
+version = "1.2.0"
 android {
     compileSdkVersion 23
     buildToolsVersion "23.0.1"
@@ -21,6 +21,7 @@ android {
 }
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:support-annotations:23.2.1'
 }
 def siteUrl = 'https://github.com/misakuo/3dTagCloudAndroid'      // 项目的主页
 def gitUrl = 'https://github.com/misakuo/3dTagCloudAndroid.git'   // Git仓库的url
diff --git a/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/Tag.java b/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/Tag.java
index 5c11aae..06eecfd 100755
--- a/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/Tag.java
+++ b/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/Tag.java
@@ -1,7 +1,6 @@
 package com.moxun.tagcloudlib.view;
 
 import android.graphics.Color;
-import android.util.Log;
 import android.view.View;
 
 /**
@@ -34,7 +33,7 @@ public class Tag {
     private float scale;
     private float[] argb;
     private static final int DEFAULT_POPULARITY = 5;
-    private View childView;
+    private View mView;
 
 
     public Tag() {
@@ -99,12 +98,12 @@ public void setScale(float scale) {
         this.scale = scale;
     }
 
-    public View getChildView() {
-        return childView;
+    public View getView() {
+        return mView;
     }
 
-    public void setChildView(View view) {
-        this.childView = view;
+    public void setView(View view) {
+        this.mView = view;
     }
 
     public void setAlpha(float alpha) {
@@ -137,7 +136,7 @@ public void setLoc2DY(float loc2dy) {
 
     public void setColorByArray(float[] rgb) {
         if (rgb != null) {
-            System.arraycopy(rgb, 0, this.argb, this.argb.length - rgb.length , rgb.length);
+            System.arraycopy(rgb, 0, this.argb, this.argb.length - rgb.length, rgb.length);
         }
     }
 
@@ -146,8 +145,6 @@ public int getColor() {
         for (int i = 0; i < 4; i++) {
             result[i] = (int) (this.argb[i] * 0xff);
         }
-        int color = Color.argb(result[0], result[1], result[2], result[3]);
-        //Log.e("TAG","#" + Integer.toHexString(color));
-        return color;
+        return Color.argb(result[0], result[1], result[2], result[3]);
     }
 }
diff --git a/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloud.java b/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloud.java
index 89a3edb..188c5bc 100755
--- a/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloud.java
+++ b/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloud.java
@@ -22,8 +22,6 @@
  * OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import android.util.Log;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -32,7 +30,6 @@
 public class TagCloud {
 
     private List<Tag> tagCloud;
-    private List<Tag> tagCloudSort;
     private int radius;
     private static final int DEFAULT_RADIUS = 3;
     private static final float[] DEFAULT_COLOR_DARK = {0.886f, 0.725f, 0.188f, 1f};
@@ -69,7 +66,6 @@ public TagCloud(List<Tag> tags, int radius, float[] tagColor1, float[] tagColor2
         this.radius = radius;
         this.tagColorLight = tagColor1;
         this.tagColorDark = tagColor2;
-        this.tagCloudSort = new ArrayList<>();
     }
 
     //create method calculates the correct initial location of each tag
@@ -100,7 +96,6 @@ public void create(boolean distrEven) {
 
     public void clear() {
         tagCloud.clear();
-        tagCloudSort.clear();
     }
 
     public List<Tag> getTagList() {
@@ -156,7 +151,6 @@ public void add(Tag newTag) {
         position(distrEven, newTag);
         //now add the new tag to the tagCloud
         tagCloud.add(newTag);
-        tagCloudSort.add(newTag);
         updateAll();
     }
 
@@ -231,6 +225,7 @@ private void updateAll() {
             tagCloud.get(j).setScale(per);
             tagCloud.get(j).setAlpha(per / 2);
         }
+        sortTagByScale();
     }
 
     private float[] getColorFromGradient(float percentage) {
@@ -273,18 +268,15 @@ public void setAngleY(float mAngleY) {
         this.mAngleY = mAngleY;
     }
 
-    public List<Tag> sortTagByScale(){
-        Collections.sort(tagCloudSort, new SortByScale());
-        return tagCloudSort;
+    public void sortTagByScale() {
+        Collections.sort(tagCloud, new TagComparator());
     }
 
-    private static class SortByScale implements Comparator {
-        public int compare(Object o1, Object o2) {
-            if(o1 instanceof Tag && o2 instanceof Tag){
-                return ((Tag) o1).getScale()>((Tag) o2).getScale()?1:-1;
-            }
-            return 0;
+    private static class TagComparator implements Comparator<Tag> {
+
+        @Override
+        public int compare(Tag o1, Tag o2) {
+            return o1.getScale() > o2.getScale() ? 1 : -1;
         }
     }
-
 }
diff --git a/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloudView.java b/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloudView.java
index 37bcabd..c4e09b9 100755
--- a/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloudView.java
+++ b/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloudView.java
@@ -2,17 +2,17 @@
 
 /**
  * Copyright © 2016 moxun
- * <p>
+ *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the “Software”),
  * to deal in the Software without restriction, including without limitation the
  * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
  * sell copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * <p>
+ *
  * The above copyright notice and this permission notice shall be
  * included in all copies or substantial portions of the Software.
- * <p>
+ *
  * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -22,7 +22,6 @@
  * OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
@@ -30,6 +29,7 @@
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
+import android.support.annotation.IntDef;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.MotionEvent;
@@ -40,12 +40,13 @@
 
 import com.moxun.tagcloudlib.R;
 
-import java.util.List;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 public class TagCloudView extends ViewGroup implements Runnable, TagsAdapter.OnDataSetChangeListener {
-    private final float TOUCH_SCALE_FACTOR = .8f;
-    private final float TRACKBALL_SCALE_FACTOR = 10;
-    private float tspeed = 2f;
+    private static final float TOUCH_SCALE_FACTOR = .8f;
+    private static final float TRACKBALL_SCALE_FACTOR = 10;
+    private float speed = 2f;
     private TagCloud mTagCloud;
     private float mAngleX = 0.5f;
     private float mAngleY = 0.5f;
@@ -56,11 +57,15 @@ public class TagCloudView extends ViewGroup implements Runnable, TagsAdapter.OnD
     private float[] darkColor = new float[]{1f, 0f, 0f, 1f};//rgba
     private float[] lightColor = new float[]{0.9412f, 0.7686f, 0.2f, 1f};//rgba
 
+    @IntDef({MODE_DISABLE, MODE_DECELERATE, MODE_UNIFORM})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Mode {
+    }
+
     public static final int MODE_DISABLE = 0;
     public static final int MODE_DECELERATE = 1;
     public static final int MODE_UNIFORM = 2;
     public int mode;
-    private int left, right, top, bottom;
 
     private MarginLayoutParams layoutParams;
     private int minSize;
@@ -123,10 +128,15 @@ private void init(Context context, AttributeSet attrs) {
         minSize = screenHeight < screenWidth ? screenHeight : screenWidth;
     }
 
-    public void setAutoScrollMode(int mode) {
+    public void setAutoScrollMode(@Mode int mode) {
         this.mode = mode;
     }
 
+    @Mode
+    public int getAutoScrollMode() {
+        return this.mode;
+    }
+
     public final void setAdapter(TagsAdapter adapter) {
         tagsAdapter = adapter;
         tagsAdapter.setOnDataSetChangeListener(this);
@@ -179,19 +189,19 @@ public void run() {
                 mTagCloud.clear();
                 removeAllViews();
                 for (int i = 0; i < tagsAdapter.getCount(); i++) {
+                    //binding view to each tag
                     Tag tag = new Tag(tagsAdapter.getPopularity(i));
                     View view = tagsAdapter.getView(getContext(), i, TagCloudView.this);
-                    tag.setChildView(view);
-                    TagCloudView.this.mTagCloud.add(tag);
-                    addView(view);
+                    tag.setView(view);
+                    mTagCloud.add(tag);
                     addListener(view, i);
                 }
-
                 mTagCloud.create(true);
-
                 mTagCloud.setAngleX(mAngleX);
                 mTagCloud.setAngleY(mAngleY);
                 mTagCloud.update();
+
+                resetChildren();
             }
         }, 0);
     }
@@ -220,7 +230,15 @@ public void onClick(View v) {
     }
 
     public void setScrollSpeed(float scrollSpeed) {
-        tspeed = scrollSpeed;
+        speed = scrollSpeed;
+    }
+
+    private void resetChildren() {
+        removeAllViews();
+        //必须保证getChildAt(i) == mTagCloud.getTagList().get(i)
+        for (Tag tag : mTagCloud.getTagList()) {
+            addView(tag.getView());
+        }
     }
 
     @Override
@@ -255,22 +273,11 @@ protected void onDetachedFromWindow() {
         handler.removeCallbacksAndMessages(null);
     }
 
-    @SuppressLint("WrongCall")
-    private void updateChild() {
-        onLayout(false, left, top, right, bottom);
-    }
-
     @Override
     protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        left = l;
-        right = r;
-        top = t;
-        bottom = b;
-        
-        List<Tag> tags = mTagCloud.sortTagByScale();
-        for (int i=0; i < tags.size(); i++) {
-            Tag tag = tags.get(i);
-            View child = tag.getChildView();
+        for (int i = 0; i < getChildCount(); i++) {
+            View child = getChildAt(i);
+            Tag tag = mTagCloud.get(i);
             if (child != null && child.getVisibility() != GONE) {
                 tagsAdapter.onThemeColorChanged(child, tag.getColor());
                 child.setScaleX(tag.getScale());
@@ -280,14 +287,13 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
                 top = (int) (centerY + tag.getLoc2DY()) - child.getMeasuredHeight() / 2;
 
                 child.layout(left, top, left + child.getMeasuredWidth(), top + child.getMeasuredHeight());
-                child.bringToFront();
             }
         }
     }
 
     public void reset() {
         mTagCloud.reset();
-        updateChild();
+        resetChildren();
     }
 
     @Override
@@ -295,14 +301,14 @@ public boolean onTrackballEvent(MotionEvent e) {
         float x = e.getX();
         float y = e.getY();
 
-        mAngleX = (y) * tspeed * TRACKBALL_SCALE_FACTOR;
-        mAngleY = (-x) * tspeed * TRACKBALL_SCALE_FACTOR;
+        mAngleX = (y) * speed * TRACKBALL_SCALE_FACTOR;
+        mAngleY = (-x) * speed * TRACKBALL_SCALE_FACTOR;
 
         mTagCloud.setAngleX(mAngleX);
         mTagCloud.setAngleY(mAngleY);
         mTagCloud.update();
 
-        updateChild();
+        resetChildren();
         return true;
     }
 
@@ -331,8 +337,8 @@ private void handleTouchEvent(MotionEvent e) {
                 float dx = e.getX() - downX;
                 float dy = e.getY() - downY;
                 if (isValidMove(dx, dy)) {
-                    mAngleX = (dy / radius) * tspeed * TOUCH_SCALE_FACTOR;
-                    mAngleY = (-dx / radius) * tspeed * TOUCH_SCALE_FACTOR;
+                    mAngleX = (dy / radius) * speed * TOUCH_SCALE_FACTOR;
+                    mAngleY = (-dx / radius) * speed * TOUCH_SCALE_FACTOR;
                     processTouch();
                 }
                 break;
@@ -354,7 +360,7 @@ private void processTouch() {
             mTagCloud.setAngleY(mAngleY);
             mTagCloud.update();
         }
-        updateChild();
+        resetChildren();
     }
 
     @Override