Adjust the review changes from mika