Challenge Token system added

fix