Major changes for progress tracker