Improved GCOM classroom