Updated pull request with feecback from Mo.