Some design updates.