Great changes have taken place in the school. It is no longer the school______ it was 30 years

ago, ________ it was so poorly equipped. [ ]

A. that; when  

B. that; which

C. what; when  

D. which; that