Scotland, Edinburgh, second half 20th century