Changed variable names, thoroughput seems ok except frames