Bug fixed and progress uses the proper methods