Danilo's edits