all feedback from PR discussion addressed.