edits and reorganization