Main file edits