Update by review comment