Update for TACL camera-ready