updated to match latest API changes in active annotations