First round of design updates