Improved data generation needed for ambulatory planning.

Improved data generation needed for ambulatory planning.