Some changes to the design.