restructured re-binning, more comments