added control on empty room & on free students