local commit
merge
reorganizing code + new histograms