Makes sense -- please see updated PR. Thanks!