address comments by @timholy