Andre's edits.