Changes suggested in PR