modify the details and bugs