Improved robustness of motion model estimates. Redefined granularity.