Changes as suggested in PR