updated classroom controller