restruct
fixes
fixes