Removed whip, added rescue from the underworld.