Added org-mode changes