v2 and improve tracking shell detection