More changes for running with data & comparing with MC