Fix moving bug
Merge branch 'feature/optimize' into develop
optimize and balance