annotation and re-org