Update: append some more annotation
Add: move specific elements to the end