add extra bins
refactor