Attempt at in-stream replacement