changed to use Improved trajectory