here in my last edits