split drawData function
add animations
Merge branch 'transition'