updates and use internal org-mode