added extra variables. Support for binning.