updates from @fperez_org's feedback