Update with advice from @jxnblk