modify the details and bugs 4