organization modifications (Step 0 and Step 1)