A school gym hall where a pupil was crushed to death is to be demolished.
Keane Wallis-Bennett, 12, died in Edinburgh's Liberton High School when a wall in the school's PE block collapsed.
The city council is expected to approve plans to demolish the gym facility over the summer, following the wishes of school staff and parents.
Efforts are also under way to develop a memorial to the first-year student.
An investigation into Keane's death on April 1 is being carried out by the Health and Safety Executive.
Councillor Paul Godzik, education convener at Edinburgh Council, said: "The overwhelming view from staff at the school, parents and the local community is that the gym should be demolished as soon as possible.
"The proposal is that this will happen at the earliest opportunity and, assuming that the necessary consents are in place, we hope this will be able to take place over the summer break to minimise disruption to the school.
"The tragic incident two months ago has obviously had a devastating effect on the local community and we are determined to work with them and other partners to ensure nothing similar can ever happen again.
"Discussions about a suitable memorial at the school for Keane are continuing and we hope to make an announcement in the near future."