tokenized and annotated updated