modify the details and bugs 3