- redesign allmost done