CG improvements

4 jobs for tweak_cg in 5 minutes and 22 seconds