Rebuild, almost better