merge old full token solution with less token solution

merge old full token solution ( a failed try) with less token solution.