Updated annotator and save function