Rework part2