Added some more octopus stuff.