Added binning, removed T loop