revised/ammend pull request 4513