Inspectors have reported improvements at a Western Isles school previously criticised following an inspection three years ago.
In 2008, the HM Inspectorate of Education (HMIe) said internal tensions between secondary staff at Castlebay was affecting the children's education.
A number of disgruntled pupils went on to stage a walk-out in March 2010.
In a new report, the HMIe said the school, which also has primary classes, had made progress.
The report was based on an inspection made in March 2010.
Inspectors said pupils were keen to learn and senior managers were working as a team and developing a culture of leadership at all levels.
The role of the youth council in developing young people's ability to lead and contribute to the school and community was also highlighted.
The islands' local authority, Comhairle nan Eilean Siar, welcomed the report.