The Edinburgh International Festival may be best known for ballet, classical music, opera and theatre - but in recent years contemporary music has become part of the programme, with performances from everybody from Arab Strap to Princess Nokia.
And, while the Edinburgh Festival Fringe no longer has its 'T on the Fringe' music strand, there are still plenty of bands and singers to look out for.
Here are 12 artists you can bag yourself a ticket for during August.
9. Blue Rose Code
Blue Rose Code, or Ross Wilson as his mum calls him, has had a great last year - appearing at the Cambridge Folk Festival and touring with The Proclaimers. He'll be at Hope City Church on Friday, August 11, performing his heartfelt songs that seamlessly blend folk, Americana, jazz, soul and pop. | Contributed
10. Pictish Trail
To mark the 10th anniverary of Eigg-based independent label Lost Map, Pictish Trail (aka former Fence Records supremo Johnny Lynch) will beplaying a full band performance sat Summerhall on Wednesday, August 14. | Contributed
11. Kathryn Joseph
Scottish Album of the Year Award winner Kathryn Joseph will be playing Summerhall's Dissection Room on Saturday, August 12, performing songs from her new album, 'For You Who Are the Wronged'. | Contributed
12. Mull Historical Society
Since 2001's 'Loss' Colin MacIntyre has released six albums under the name Mull Historical Society, as well as two under his own name. He'll be playing a career-spanning set at Summerhall on Friday. August 4. | Contributed