Add rebuild (properly this time)