Added TODO for taring