In 1985, William Mitchell became the headmaster. The school's needs and demands for added facilities reached a point where one building was no longer sufficient. When St. Andrew's United Church across the street closed, Selwyn House purchased and renovated it, and it is now known as the Macaulay Building. In 1999, the school underwent substantial renovations in its three main buildings on campus. In 2002, the school built the Speirs Building which housed a new double-sized gym, a spacious high-tech library, numerous classrooms, offices and an agora for student assemblies and various other functions. This was followed by a massive renovation of the original Lucas Building, including converting its gymnasium into a large, modern dining hall and fully equipped auditorium, dubbed Coristine Hall.