Here's some short video clips from Radio 4's comedy showcase, recorded live on Edinburgh's Royal Mile...

Doc Brown raps about the British olympics

View this clip on the BBC website

Tom Wrigglesworth

View this clip on the BBC website

Scott Mills trying out Just A Minute

View this clip on the BBC website

Richard Herring

View this clip on the BBC website

You can watch all the highlights from Edinburgh at www.bbc.co.uk/radio4 and see exclusive footage via the red button from Wednesday 25th August. You can also follow Radio 4 on Twitter: @BBCRadio4 and on Facebook too: www.facebook.com/BBCRadio4