Added C, S, A cases for non-<> scenario. However, need to add arbitrary tone X for that case. Then work on <> case.