SCSA custom + ric flair fix up