Changed generator

Generator now uses both trigram and/or bigram