TODO update and removed progress bar until I fix it.