Design updates from Matthew