Updates per comments.