Small changes to part2