Updates after Adi & Jason's input.