Doctor Who storylines revealed by writer Steven Moffat
Some of the storylines for the next series of Doctor Who have been revealed by the show's producer and writer Steven Moffat.
He says the doctor will take on pre-historic creatures in a story called Dinosaurs on a Spaceship.
There will also be a western-themed episode called A Town Called Mercy.
Those storylines will follow the first episode in the new series in which he will be reunited with his oldest enemies in Asylum of the Daleks.
Moffat and the cast were speaking about the future of the show at the Comic-Con sci-fi convention in San Diego.
Steven Moffat said: "Dinosaurs on a Spaceship - what more do you need?
"The Doctor will come face to face with some of the most monstrous creatures evolution has ever produced, on some of the most monstrous sets we've ever built.
"We took one look at Chris Chibnall's brilliant script and said to ourselves 'We're going to need a bigger corridor'.
"And Toby Whithouse's A Town Called Mercy takes us into a genre Doctor Who hasn't attempted since the 60s - it's a full-blooded western.
"We knew from the start we needed some serious location shooting for this one, and given the most iconic American setting imaginable, there was only one place to go - Spain."
Dinosaurs on a Spaceship stars Fast Show actor Mark Williams as the father of Arthur Darvill's Rory and Sherlock star Rupert Graves.
Matt Smith, the 11th incarnation of the doctor, told the audience at their Comic-Con panel discussion that filming the show was fun with the cast members becoming like family.
He said: "You [spend] every waking hour of the day together.
"It's nine months and we film away from London and away from our friends and we don't really argue."
The new series of Doctor Who returns to BBC One this autumn.
It will be followed by a Christmas special and another eight episodes next year.