some changes to redesign