Changes as per discussion.