move token params to method and tap