Optimization for high numbers
Merge branch 'test/performance'