Part 1_fixing changes