Minor: Change design