updated to part2