Design updates, rebuild