fix bugs, and it becomes more fast. now start to integrate new method.