Updated CGFMatrix