more edits for my uses