Continuing work on OPTAA functions