Addressed Jason's review concerns