Added final edits to _main