Restructurization: step 18