MS-580 edits