Rework for pull request