removed extra branch choices, and added school