Revert to bigrams for now