* make side-effect free * use Modeling#updateWaypoints for actual update
Closes #1010 Related to #973