design changes
some changes