Added better progress reporting