part2 changes applied