added untapping