More of Victor's edits