Fixed bug, added throughput