some changes to the design