Refactored for more in CG init