classroom changes (small pop and fixed empty pop request)