For #342 - addressing further feedback