added some variations from last pull request