Rework for the pull request