optimize new token action. do not need quick fix any more