s/tolken/token
Merged some stuff