[TASK] Cosmetics and CGL fix