added whales and whatnot