some changes for design