Edits in progress on DEFCS