New build
Now tokenizes abbreviated words