Finished changes to tpcc