Restructurization: step 8