CFGU: Some changes