Applied new interface and change wholw structure