part1 modified again