Some updates to the design.