Changes as per comments.