Added animation callback
Changed collision method