Updates after Josh's comments