Adjusted org-setup for newest version