some changes in design