some changes about design