Ok, final edits - I hope