some changes on design