fixing everyting with tokens and conv keys