Updated bigram mapper & reducer