implemented progress bar
resolved merge conflicts