Integrated Jeremy's Edits