update some code for annotation