Fixing Step5 part1