Trying improvements to trajectorization.