Restructurization: step 9