fix the issues so I hope it could pass the full review.