add the binner and redo some more things