zafar's pull request