bringing in tapstream changes