By next point, I meant that this can be in another pull request.