registration now uses tokens