bug fix and add animation