restruct
fix