Improved accuracy vs speed