Final pre-submission commit (hopefully)