Restructurization: step 17