6-12 grade school. Benjamin Franklin Middle School (closed at the end of the 2004–2005 academic year) was located at 1430 Scott Street and renamed in the fall of 2006 as the Burl L. Toler Campus and is now home to both Gateway High School and KIPP SF Bay Academy (both charter schools). Horace Mann Middle School (was merged with Buena Vista K-5 to form a K-8 program starting in fall 2011 while supporting the 7th & 8th graders who had started at Horace Mann) Enola Maxwell Middle School (closed at the end of the 2005–2006 academic year) (formerly Potrero Middle School) then home to I.S.A. High School, and now home to San Francisco International High School. K-8 schools Willie L. Brown Jr. Academy College Preparatory School, 4-8 (formerly Twenty-First Century K-8) (closed at the end of the 2010–2011 academic year for considerable renovations as well as academic issues.) Treasure Island School (closed mid-school year, December 16, 2005) Twenty-First Century K-8 (became Willie L. Brown College Preparatory 2004–2005) Elementary schools Cabrillo Elementary School (closed at the end of the 2005–2006 academic year) was located at 750 25th Avenue in the Outer Richmond District. It is now used as a district office for Curriculum & Instruction, VAPA & IT. Columbus Elementary was located at 1541 12th Avenue in the Inner Sunset Neighborhood. In 1995, SFUSD opened its first Chinese Immersion School in the District called Alice Fong Yu Alternative School. William R. De Avila Elementary (formerly Dudley Stone Elementary) was located at 1351 Haight Street, between Masonic and Central in the Upper Haight. The school was closed at the end of the 2004–2005 school year and briefly rented to City College of San Francisco. Before the start of the 2009–2010 school year, the school district re-opened De Avila as the Chinese Immersion School at De Avila. Kindergarten and 1st grade students were enrolled for 2009–2010, with the plan of gradually expanding the school to comprise grades K-5. Diamond Heights Elementary (currently home to the San Francisco Police Academy & PAL) was located at 350 Amber Drive, just behind the Diamond Heights' Safeway. The building was built in the 1960s hugging the Diamond Heights/Glen Park Canyon. Almost immediately upon completion the property was determined to be unsafe and sliding into the canyon. The school was closed for one year, shored up and reopened. It was closed as a public school in the 1980s.