Updated annotate