#391 new version for annotation
Better comments