better trakcing of random complete