fixed most of buffering issue