Made the changes

Submitting pull request. Please review!