Avoiding the term "mode" in opus_demo