Change to use Nancy's work.