Updates after discussion w/ Jed