some changes in the design