Fixing the progress bar - almost there