Started rebuild -- broken