modify the details and bugs 5