Some final edits before first trying to run