adding chris' changes manualy since github can't automatically merge pull request