Furthe addressing comments on PR.