Addressing @Jorge-C comments