updated tokens controller