remi's changes to annotate