A version that tracks car better