before big restruct