part1 and 2
removed temp file
finished part2