changed buffering parameters to make more sense