most of redesign done