updated progress bar logic more
updated merge conflicts