Work on client (pixi) and using an updated version of server tokenizer