For the first time ever, this year's BBC Edinburgh Festival benefited from combining a wide array of talents under one roof for all its Fringe activities. Potterrow, near Bristo Square was the base of the BBC's activities from Friday 12 to Saturday 27 August. You can catch up with some of the highlights of our coverage below.
BBC Radio Scotland's blog and BBC News were on hand with regular reports and BBC Comedy kept track of the funnies. There was also a whole host of tv and radio coverage which you can find out more about below.

MacAulay and Co at Edinburgh Festival 2011
Some highlights from the show featuring Ed Byrne, Al Murray, Hannibal Buress, Andi Osho, Patrick Monahan and Terry Alderton MacAulay and Co - Mark Beaumont Challenge for Children in Need 2009. Life coach Gillian Brown gives some motivational tips.
More Edinburgh Festivals 2011 on BBC TV & Radio
MacAulay and Co
Fred MacAulay and his team broadcast daily from Potterow and guests included Al Murray, Ed Byrne, Arthur Smith, Time Vine and many more.
The Festival Cafe
Janice Forsyth and Clare English also broadcast daily and brought you the latest news, interviews and discussion from the festival
The Culture Show
Highlighting the best theatre, dance, music, opera, performance, art, literature and comedy that the festival has to offer.
The Review Show
In three weekly live shows, Kirsty Wark was joined by guests to debate the merits of the plethora of art exhibitions, book launches, plays, operas, ballets and comedians.
Edinburgh Military Tattoo
This action-packed programme of highlights featured exciting displays and music from the Massed Bands of Her Majesty's Royal Marines, the Brazilian Marine Corps Band, the German Mountain Army Band and much more.
The Comedy Zone
Throughout the month of August, The Comedy Zone showcased lots of great Fringe comedy talent, presented by Paul Sinha, Andi Osho and more.
BBC Introducing in Scotland with Ally McCrae
Broadcasting live from The Bongo Club in Edinburgh on Sunday 4 Sept with guests Hostage, Profisee, We Were Promised Jetpacks and Bwani Junction.
BBC Learning - The L.A.B - Comedy Workshops
The L.A.B and BBC Comedy ran three one day stand up comedy workshops on 23rd/24th/25th August 2011
Classics Unwrapped
Jamie MacDougall came live from Edinburgh with musicians from the International Festival.
Lunchtime Concerts
The BBC Radio 3 series shall be recording throughout the Edinburgh International Festival with broadcasts scheduled for the end of August/early September.
BBC SSO at the Edinburgh International Festival
At this year's EIF the BBC SSO renewed its close partnership with composer Jonathan Harvey, by revisiting the extraordinary Triptych he composed especially for the orchestra and Ilan Volkov.
Off The Ball
Tam Cowan and Stuart Cosgrove brought their feast of football chat to the festival on August 27 and brought BBC Radio Scotland's Edinburgh Festival coverage to a close.















Riches winner at Edinburgh awards
Brian Cox hits out at BBC critics






