3rd edit and nontracking branch