suggestions from PR