edits for Martin