Final changes to the design