Made the changes suggested by Kevin.