added subject and rooms