Edits from John and Sho.