modify the details and bugs again