uncommented the token codes