hopefully made correct edits