Progress tracking

@pavlostd

We have made some changes. Please check the post below: