To address ui review comment.