merge
add animation class