simplified previous pull request