some reorg, dedicated chapter for annotations