Added changes requested in latest version.