Redo calls to rwtag