working on token and role issues