adding token calls
fix setup