Fixed throughput
Merged changes