updated files as per pull request