changes per comments in github discussion