Restructurization: step 10