more edits. final