Making changes for Jason's review comments.