[Air-l] Modified CFS for AoIR Panel