add progress bars
merge