// some design fixs