Added changes requested by him in PR commit