CGE2: Some cosmetic changes