Updates as per comments.