new token check + otehr stuff