With Mr. Petili's (?) edits