Rebuild (again)