Improved speed (drawing is the bottleneck, not computation)