Update to address @claywilkinson comments