Rewrite w/buffer queue