[CDE-173] - Updating cgg draw calls