fix expand all
add annotation