getting rid of duplicate code
Merge branch 'master' of https://github.com/seanjames777/15214