Added proper windowing (I think) for windowed throughput.