Change design
Change constants