added better support for octopus animation