Rebuild tools