Updated per a few external conversations