changes to remove need for AnnotateIt