Started on changing the analyzer, doesn't work yet!