made some changes about the design.