adapted to org-update