swapped to use the yandex2 implementation