PR 31-10-61 edit