changes per PR discussion