Improved Annotating