Refactored to have animation class
Fixed merge conflict