jh: wagner, unf, aao case study edits