Anton's and Sylvia's edits