speed up animation
reorganize