Nathan's Annotation changes