Restructurization: step 23