sourceAFIRCA specific edits.