Addressing feedback from @pornel