change order of org loading