Reverted to the old progress display
Removed unnecessary directives
Fixed pipeline scoping issue