move final stuff for buffering