Edits to cover more of the maximum security model