integrated feedback from @russeldb