progress bar added
merge