Horrible mess

Fix tokens