added some of q1 to part2