Progress change is working
Fix conflicts
Fix more conflicts