more changes to properly copy the call token and a small code optimization