Changed return value to token only