ENG-4729 update with john's review comments