updated for part2