In the annex i would change the rectangle tables to round tables to make it easier to study and talk to groups for the students. With the tables the annex will be much quieter because the students wont have to yell or talk loud to each other becasue they will be closer to each other.