Added support for bigrams, ordering switch