rebuild structure
rebuild #2