[Air-l] rccs redesign