Change design and related changes.