n37-005: edits from SV