changes per comments.