final edits for Mihai