Issue 9: "Rebuild"