Better token logic