[TASK] Fix CGL Stuff