huge commit, sort later