Fixing calls and tokenizer again...