Jonathans final edits